diff --git a/packages/kbot/dist-in/commands/images.js b/packages/kbot/dist-in/commands/images.js index b16467c2..83fa6cce 100644 --- a/packages/kbot/dist-in/commands/images.js +++ b/packages/kbot/dist-in/commands/images.js @@ -211,8 +211,14 @@ async function launchGuiAndGetPrompt(argv) { const baseFileName = genFiles.length > 0 ? path.basename(genFiles[0], path.extname(genFiles[0])) : 'generated'; - const newFileName = `${baseFileName}_gen_0.png`; - const finalDstPath = path.resolve(dstDir, newFileName); + let i = 0; + let newFileName; + let finalDstPath; + do { + newFileName = `${baseFileName}_gen_${i}.png`; + finalDstPath = path.resolve(dstDir, newFileName); + i++; + } while (exists(finalDstPath)); logger.info(`📝 Determined destination path for generated image: ${finalDstPath}`); // --- End new logic --- logger.info(`🎨 Starting image generation: "${genPrompt}"`); @@ -231,8 +237,10 @@ async function launchGuiAndGetPrompt(argv) { else { // Image creation logger.info(`Creating image with prompt: "${genPrompt}"`); + const creationArgv = { ...argv }; + delete creationArgv.include; const parsedOptions = ImageOptionsSchema().parse({ - ...argv, + ...creationArgv, prompt: genPrompt, dst: finalDstPath // Use the new path }); @@ -379,4 +387,4 @@ export const imageCommand = async (argv) => { logger.error('Failed to parse options or generate image:', error.message, error.issues, error.stack); } }; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"images.js","sourceRoot":"","sources":["../../src/commands/images.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,IAAI,IAAI,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,IAAI,IAAI,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EACH,YAAY,EACZ,QAAQ,EACR,UAAU,EACb,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,SAAS,aAAa;IAElB,sEAAsE;IACtE,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;IAClE,oFAAoF;IACpF,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC;QAC5E,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;QACxB,CAAC,CAAC,SAAS,CAAC;IAEZ,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAEjE,+DAA+D;IAC/D,IAAI,WAAmB,CAAC;IACxB,IAAI,cAAsB,CAAC;IAE3B,QAAQ,OAAO,CAAC,QAAQ,EAAE,CAAC;QACvB,KAAK,OAAO;YACR,WAAW,GAAG,QAAQ,CAAC;YACvB,cAAc,GAAG,eAAe,CAAC;YACjC,MAAM;QACV,KAAK,QAAQ;YACT,WAAW,GAAG,QAAQ,CAAC;YACvB,cAAc,GAAG,WAAW,CAAC;YAC7B,MAAM;QACV,KAAK,OAAO;YACR,WAAW,GAAG,UAAU,CAAC;YACzB,cAAc,GAAG,WAAW,CAAC;YAC7B,MAAM;QACV;YACI,MAAM,IAAI,KAAK,CAAC,yBAAyB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACnC,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC,IAAI,CAAC;QACpC,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,IAAI;QACb,GAAG,EAAE,IAAI;QACT,KAAK,EAAE,IAAI;QACX,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,IAAI;QACb,GAAG,EAAE,IAAI;KACZ,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC,MAAM,CAAC;QACrB,GAAG,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,0BAA0B,CAAC;QAChE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC,QAAQ,CAAC,+CAA+C,CAAC;QACrH,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,kDAAkD,CAAC;QAC5E,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,2CAA2C,CAAC;KACtF,CAAC,CAAC;AACP,CAAC,CAAA;AAED,KAAK,UAAU,qBAAqB,CAAC,IAAS;IAC1C,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAE/B,OAAO,IAAI,OAAO,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;QACpC,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;QACnC,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YACtB,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,iCAAiC,UAAU,8EAA8E,CAAC,CAAC,CAAC;QACxJ,CAAC;QAED,wBAAwB;QACxB,MAAM,IAAI,GAAa,EAAE,CAAC;QAE1B,oBAAoB;QACpB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7E,MAAM,gBAAgB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5D,IAAI,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;QACnC,CAAC;QAED,cAAc;QACd,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,IAAI,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC;QACnD,IAAI,MAAM,EAAE,CAAC;YACT,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACnC,CAAC;QAED,UAAU;QACV,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACX,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,CAAC;QAED,aAAa;QACb,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC;QAED,MAAM,YAAY,GAAG,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;QAElF,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,WAAW,GAAG,EAAE,CAAC;QAErB,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAE9B,yCAAyC;YACzC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YAC5D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACvB,IAAI,CAAC;oBACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACjC,IAAI,OAAO,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;wBACpC,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;wBAEnD,2CAA2C;wBAC3C,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;wBAChC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,IAAI,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC;wBACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;wBACnG,MAAM,gBAAgB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;wBAE5D,qEAAqE;wBACrE,MAAM,cAAc,GAAG;4BACnB,GAAG,EAAE,4BAA4B;4BACjC,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,IAAI;4BAC3B,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI,IAAI;4BACrB,MAAM,EAAE,MAAM,IAAI,IAAI;4BACtB,KAAK,EAAE,gBAAgB;yBAC1B,CAAC;wBAEF,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,CAAC;wBACjE,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;wBAE9C,kBAAkB;wBAClB,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;4BACvC,IAAI,CAAC;gCACD,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;oCACpB,MAAM,WAAW,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;oCAC5C,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;oCAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC;oCAC/F,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;oCAE1C,yBAAyB;oCACzB,MAAM,CAAC,IAAI,CAAC,4BAA4B,QAAQ,EAAE,EAAE;wCAChD,UAAU,EAAE,WAAW,CAAC,MAAM;wCAC9B,UAAU,EAAE,MAAM,CAAC,MAAM;wCACzB,YAAY,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC;wCACrC,aAAa,EAAE,wBAAwB,CAAC,IAAI,CAAC,MAAM,CAAC;qCACvD,CAAC,CAAC;oCAEH,MAAM,aAAa,GAAG;wCAClB,GAAG,EAAE,2BAA2B;wCAChC,MAAM;wCACN,QAAQ;wCACR,QAAQ,EAAE,SAAS;qCACtB,CAAC;oCAEF,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,CAAC;oCAChE,MAAM,CAAC,IAAI,CAAC,uBAAuB,QAAQ,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,GAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gCACzF,CAAC;4BACL,CAAC;4BAAC,OAAO,KAAK,EAAE,CAAC;gCACb,MAAM,CAAC,KAAK,CAAC,yBAAyB,SAAS,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;4BACtE,CAAC;wBACL,CAAC;oBACL,CAAC;yBAAM,IAAI,OAAO,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;wBAC3C,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;wBACnD,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;wBAClC,IAAI,YAAY,IAAI,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;4BACzC,IAAI,CAAC;gCACD,IAAI,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;oCACvB,UAAU,CAAC,YAAY,CAAC,CAAC;oCACzB,MAAM,CAAC,IAAI,CAAC,gCAAgC,YAAY,EAAE,CAAC,CAAC;oCAC5D,MAAM,eAAe,GAAG;wCACpB,GAAG,EAAE,2BAA2B;wCAChC,IAAI,EAAE,YAAY;qCACrB,CAAC;oCACF,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,CAAC;gCACtE,CAAC;qCAAM,CAAC;oCACJ,MAAM,CAAC,IAAI,CAAC,mCAAmC,YAAY,EAAE,CAAC,CAAC;oCAC/D,MAAM,aAAa,GAAG;wCAClB,GAAG,EAAE,qBAAqB;wCAC1B,IAAI,EAAE,YAAY;wCAClB,KAAK,EAAE,2BAA2B;qCACrC,CAAC;oCACF,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,CAAC;gCACpE,CAAC;4BACL,CAAC;4BAAC,OAAO,KAAK,EAAE,CAAC;gCACb,MAAM,CAAC,KAAK,CAAC,4BAA4B,YAAY,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;gCACxE,MAAM,aAAa,GAAG;oCAClB,GAAG,EAAE,qBAAqB;oCAC1B,IAAI,EAAE,YAAY;oCAClB,KAAK,EAAE,KAAK,CAAC,OAAO;iCACvB,CAAC;gCACF,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,CAAC;4BACpE,CAAC;wBACL,CAAC;6BAAM,CAAC;4BACJ,MAAM,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;wBACtE,CAAC;oBACL,CAAC;yBAAM,IAAI,OAAO,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;wBAC7C,MAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;wBAEvD,2EAA2E;wBAC3E,IAAI,CAAC;4BACD,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;4BACjC,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;4BAErC,yCAAyC;4BACzC,IAAI,MAAc,CAAC;4BAEnB,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;gCACX,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gCAC3C,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gCACnE,IAAI,OAAO,IAAI,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;oCACnC,MAAM,GAAG,WAAW,CAAC;gCACzB,CAAC;qCAAM,CAAC;oCACJ,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;gCACvC,CAAC;4BACL,CAAC;iCAAM,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gCAC7B,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;4BACvC,CAAC;iCAAM,CAAC;gCACJ,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,kCAAkC;4BAC9D,CAAC;4BAED,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC;gCACpC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;gCACvD,CAAC,CAAC,WAAW,CAAC;4BAElB,MAAM,WAAW,GAAG,GAAG,YAAY,YAAY,CAAC;4BAEhD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;4BACvD,MAAM,CAAC,IAAI,CAAC,uDAAuD,YAAY,EAAE,CAAC,CAAC;4BACnF,wBAAwB;4BAExB,MAAM,CAAC,IAAI,CAAC,kCAAkC,SAAS,GAAG,CAAC,CAAC;4BAE5D,IAAI,WAAW,GAAkB,IAAI,CAAC;4BAEtC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gCACtB,gBAAgB;gCAChB,MAAM,CAAC,IAAI,CAAC,qBAAqB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,SAAS,GAAG,CAAC,CAAC;gCACrF,MAAM,aAAa,GAAG,kBAAkB,EAAE,CAAC,KAAK,CAAC;oCAC7C,GAAG,IAAI;oCACP,MAAM,EAAE,SAAS;oCACjB,OAAO,EAAE,QAAQ;oCACjB,GAAG,EAAE,YAAY,CAAC,mBAAmB;iCACxC,CAAC,CAAC;gCACH,WAAW,GAAG,MAAM,SAAS,CAAC,SAAS,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;4BACtE,CAAC;iCAAM,CAAC;gCACJ,iBAAiB;gCACjB,MAAM,CAAC,IAAI,CAAC,gCAAgC,SAAS,GAAG,CAAC,CAAC;gCAC1D,MAAM,aAAa,GAAG,kBAAkB,EAAE,CAAC,KAAK,CAAC;oCAC7C,GAAG,IAAI;oCACP,MAAM,EAAE,SAAS;oCACjB,GAAG,EAAE,YAAY,CAAC,mBAAmB;iCACxC,CAAC,CAAC;gCACH,WAAW,GAAG,MAAM,WAAW,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;4BAC9D,CAAC;4BAED,IAAI,WAAW,EAAE,CAAC;gCACd,KAAK,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;gCACjC,MAAM,CAAC,IAAI,CAAC,qBAAqB,YAAY,EAAE,CAAC,CAAC;gCAEjD,uDAAuD;gCACvD,MAAM,YAAY,GAAG,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;gCAEpD,MAAM,aAAa,GAAG;oCAClB,GAAG,EAAE,2BAA2B;oCAChC,MAAM,EAAE,YAAY;oCACpB,QAAQ,EAAE,WAAW;oCACrB,QAAQ,EAAE,YAAY;iCACzB,CAAC;gCAEF,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,CAAC;gCAChE,MAAM,CAAC,IAAI,CAAC,kCAAkC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;4BACjF,CAAC;iCAAM,CAAC;gCACJ,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;gCAE3C,yBAAyB;gCACzB,MAAM,aAAa,GAAG;oCAClB,GAAG,EAAE,kBAAkB;oCACvB,KAAK,EAAE,0BAA0B;iCACpC,CAAC;gCACF,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,CAAC;4BACpE,CAAC;wBACL,CAAC;wBAAC,OAAO,KAAK,EAAE,CAAC;4BACb,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;4BAEnD,yBAAyB;4BACzB,MAAM,aAAa,GAAG;gCAClB,GAAG,EAAE,kBAAkB;gCACvB,KAAK,EAAE,KAAK,CAAC,OAAO;6BACvB,CAAC;4BACF,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,CAAC;wBACpE,CAAC;oBACL,CAAC;gBACL,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACT,4CAA4C;oBAC5C,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oBACvD,MAAM,IAAI,IAAI,GAAG,IAAI,CAAC;gBAC1B,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACpC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;YACxD,WAAW,IAAI,KAAK,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAAE,IAAI,CAAC,CAAC;YACnD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;YACrD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;YAE1D,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBACb,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;gBACpC,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;gBACxE,QAAQ,CAAC,aAAa,IAAI,IAAI,CAAC,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACJ,MAAM,CAAC,IAAI,KAAK,CAAC,8BAA8B,IAAI,aAAa,WAAW,EAAE,CAAC,CAAC,CAAC;YACpF,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC7B,MAAM,CAAC,GAAG,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAGD,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,IAAS,EAAE,EAAE;IAC5C,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAE/B,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,IAAI,CAAC;YACD,MAAM,SAAS,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,CAAC;YACpD,IAAI,SAAS,EAAE,CAAC;gBACZ,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBACtC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;gBAC7B,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC5C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;gBACjC,CAAC;gBACD,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;oBACd,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;gBAC3B,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,MAAM,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;gBACtD,OAAO;YACX,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YAClD,OAAO;QACX,CAAC;IACL,CAAC;IAED,IAAI,IAAI,CAAC,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACzC,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,CAAC;QACD,MAAM,aAAa,GAAG,kBAAkB,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,aAAa,CAAC;QAEhD,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,CAAC;QACzD,MAAM,MAAM,GAAG,aAAa,EAAE,OAAiB,IAAI,EAAE,CAAC;QAEtD,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACtB,MAAM,CAAC,KAAK,CAAC,yFAAyF,CAAC,CAAC;YACxG,OAAO;QACX,CAAC;QAED,IAAI,CAAC,GAAG,EAAE,CAAC;YACP,MAAM,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;YACnE,OAAO;QACX,CAAC;QAED,IAAI,WAAW,GAAkB,IAAI,CAAC;QAEtC,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpD,gBAAgB;YAChB,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE,CAAC;gBAC9B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;oBACrB,MAAM,CAAC,KAAK,CAAC,6BAA6B,SAAS,EAAE,CAAC,CAAC;oBACvD,OAAO;gBACX,CAAC;YACL,CAAC;YACD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACV,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;gBACxD,OAAO;YACX,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,qBAAqB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,MAAM,GAAG,CAAC,CAAC;YACjF,WAAW,GAAG,MAAM,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QAClE,CAAC;aAAM,IAAI,MAAM,EAAE,CAAC;YAChB,iBAAiB;YACjB,MAAM,CAAC,IAAI,CAAC,gCAAgC,MAAM,GAAG,CAAC,CAAC;YACvD,WAAW,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAC3D,CAAC;QAED,IAAI,WAAW,EAAE,CAAC;YACd,MAAM,IAAI,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;YACtC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;YACpE,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YAC5B,MAAM,CAAC,IAAI,CAAC,mBAAmB,OAAO,EAAE,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC9C,CAAC;IAEL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,MAAM,CAAC,KAAK,CAAC,4CAA4C,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACzG,CAAC;AACL,CAAC,CAAC"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"images.js","sourceRoot":"","sources":["../../src/commands/images.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/kbot/dist/win-64/tauri-app.exe b/packages/kbot/dist/win-64/tauri-app.exe index c52a2ab4..a4a453ee 100644 Binary files a/packages/kbot/dist/win-64/tauri-app.exe and b/packages/kbot/dist/win-64/tauri-app.exe differ diff --git a/packages/kbot/gui/tauri-app/src/App.tsx b/packages/kbot/gui/tauri-app/src/App.tsx index bc7d5bdc..013090e9 100644 --- a/packages/kbot/gui/tauri-app/src/App.tsx +++ b/packages/kbot/gui/tauri-app/src/App.tsx @@ -145,7 +145,7 @@ function App() { const saveAndClose = async () => { // Find the last generated image - const generatedFiles = files.filter(file => file.path.startsWith('generated_')); + const generatedFiles = files.filter(file => file.isGenerated); if (generatedFiles.length === 0) { addDebugMessage('warn', 'No generated images to save'); return; @@ -158,7 +158,7 @@ function App() { // Send the final result back to images.ts for saving const result = { prompt, - files: files.filter(f => !f.path.startsWith('generated_')).map(f => f.path), + files: files.filter(f => !f.isGenerated).map(f => f.path), dst, generatedImage: { src: lastGenerated.src, diff --git a/packages/kbot/gui/tauri-app/src/components/ImageGallery.tsx b/packages/kbot/gui/tauri-app/src/components/ImageGallery.tsx index 25db5cb7..3970ec4c 100644 --- a/packages/kbot/gui/tauri-app/src/components/ImageGallery.tsx +++ b/packages/kbot/gui/tauri-app/src/components/ImageGallery.tsx @@ -20,10 +20,10 @@ export default function ImageGallery({ const [lightboxOpen, setLightboxOpen] = useState(false); const [lightboxLoaded, setLightboxLoaded] = useState(false); - // Reset current index if images change + // Reset current index if images change, preventing out-of-bounds errors useEffect(() => { - if (currentIndex >= images.length && images.length > 0) { - setCurrentIndex(0); + if (images.length > 0 && currentIndex >= images.length) { + setCurrentIndex(Math.max(0, images.length - 1)); } }, [images.length, currentIndex]); @@ -71,17 +71,14 @@ export default function ImageGallery({ preloadImage(index); }; - const handleThumbnailClick = (imagePath: string, index: number) => { - // Always change the main image first - setCurrentIndex(index); - - // If it's a generated image and selection is enabled, also toggle selection - /* - const isGenerated = imagePath.startsWith('generated_'); - if (showSelection && onImageSelect) { - onImageSelect(imagePath); + const handleThumbnailClick = (event: React.MouseEvent, imagePath: string, index: number) => { + if (event.ctrlKey || event.metaKey) { + if (showSelection && onImageSelect) { + onImageSelect(imagePath); + } + } else { + setCurrentIndex(index); } - */ }; if (images.length === 0) { @@ -100,9 +97,24 @@ export default function ImageGallery({ ); } - const currentImage = images[currentIndex]; - const isGenerated = currentImage?.path.startsWith('generated_'); - const isSelected = currentImage?.selected || false; + // Safeguard against rendering with an invalid index after a delete/remove operation + const safeIndex = Math.max(0, Math.min(currentIndex, images.length - 1)); + const currentImage = images.length > 0 ? images[safeIndex] : null; + + if (!currentImage) { + // This should theoretically not be reached if the length check above is sound, + // but it's an extra layer of protection. + return ( +
+
+

Loading...

+
+
+ ); + } + + const isGenerated = !!currentImage.isGenerated; + const isSelected = currentImage.selected || false; return (
@@ -119,7 +131,7 @@ export default function ImageGallery({ ? 'border-green-300' : 'border-white/30' }`} - onDoubleClick={() => openLightbox(currentIndex)} + onDoubleClick={() => openLightbox(safeIndex)} title="Double-click for fullscreen" />
@@ -145,7 +157,7 @@ export default function ImageGallery({ {/* Compact Image Info */}

- {currentImage.path.split(/[/\\]/).pop()} • {currentIndex + 1}/{images.length} + {currentImage.path.split(/[/\\]/).pop()} • {safeIndex + 1}/{images.length}

@@ -153,15 +165,16 @@ export default function ImageGallery({
{images.map((image, index) => { const thumbIsGenerating = image.path.startsWith('generating_'); - const thumbIsGenerated = image.path.startsWith('generated_'); + const thumbIsGenerated = !!image.isGenerated; const thumbIsSelected = image.selected || false; return ( {/* Navigation Buttons */} - {currentIndex > 0 && ( + {safeIndex > 0 && ( )} - {currentIndex < images.length - 1 && ( + {safeIndex < images.length - 1 && (
diff --git a/packages/kbot/gui/tauri-app/src/hooks/useTauriListeners.ts b/packages/kbot/gui/tauri-app/src/hooks/useTauriListeners.ts index 9f3d5a3c..6508ba61 100644 --- a/packages/kbot/gui/tauri-app/src/hooks/useTauriListeners.ts +++ b/packages/kbot/gui/tauri-app/src/hooks/useTauriListeners.ts @@ -70,13 +70,12 @@ export function useTauriListeners({ if (imageData.base64 && imageData.mimeType && imageData.filename) { const src = `data:${imageData.mimeType};base64,${imageData.base64}`; - const hasGeneratingPlaceholder = document.querySelector('[src^="data:image/svg+xml"]'); // A bit hacky, but avoids depending on files state - const isGeneratedImage = isGenerating || hasGeneratingPlaceholder || imageData.filename.includes('_out') || imageData.filename.includes('generated_'); + const isGeneratedImage = isGenerating || document.querySelector('[src^="data:image/svg+xml"]'); if (isGeneratedImage) { - const generatedImageFile: ImageFile = { path: `generated_${imageData.filename}`, src }; + const generatedImageFile: ImageFile = { path: imageData.filename, src, isGenerated: true }; setFiles(prev => { - const withoutPlaceholder = prev.filter(file => !file.path.startsWith('generating_') && !file.path.endsWith(imageData.filename) && file.path !== `generated_${imageData.filename}`); + const withoutPlaceholder = prev.filter(file => !file.path.startsWith('generating_') && file.path !== imageData.filename); return [...withoutPlaceholder, generatedImageFile]; }); @@ -87,7 +86,7 @@ export function useTauriListeners({ setIsGenerating(false); addDebugMessage('info', '✅ Generated image added to files', { filename: imageData.filename, prompt }); } else { - const newImageFile = { path: imageData.filename, src }; + const newImageFile: ImageFile = { path: imageData.filename, src, isGenerated: false }; setFiles(prevFiles => { const exists = prevFiles.some(f => f.path === imageData.filename); if (!exists) { diff --git a/packages/kbot/gui/tauri-app/src/types.ts b/packages/kbot/gui/tauri-app/src/types.ts index 18ea8580..06a19efe 100644 --- a/packages/kbot/gui/tauri-app/src/types.ts +++ b/packages/kbot/gui/tauri-app/src/types.ts @@ -2,6 +2,7 @@ export interface ImageFile { path: string; src: string; selected?: boolean; + isGenerated?: boolean; } export interface GeneratedImage { diff --git a/packages/kbot/src/commands/images.ts b/packages/kbot/src/commands/images.ts index bdad6dba..80eae5bb 100644 --- a/packages/kbot/src/commands/images.ts +++ b/packages/kbot/src/commands/images.ts @@ -239,9 +239,15 @@ async function launchGuiAndGetPrompt(argv: any): Promise { ? path.basename(genFiles[0], path.extname(genFiles[0])) : 'generated'; - const newFileName = `${baseFileName}_gen_0.png`; + let i = 0; + let newFileName; + let finalDstPath; + do { + newFileName = `${baseFileName}_gen_${i}.png`; + finalDstPath = path.resolve(dstDir, newFileName); + i++; + } while (exists(finalDstPath)); - const finalDstPath = path.resolve(dstDir, newFileName); logger.info(`📝 Determined destination path for generated image: ${finalDstPath}`); // --- End new logic --- @@ -262,8 +268,10 @@ async function launchGuiAndGetPrompt(argv: any): Promise { } else { // Image creation logger.info(`Creating image with prompt: "${genPrompt}"`); + const creationArgv = { ...argv }; + delete creationArgv.include; const parsedOptions = ImageOptionsSchema().parse({ - ...argv, + ...creationArgv, prompt: genPrompt, dst: finalDstPath // Use the new path }); diff --git a/packages/kbot/tests/assets/m1.jpg b/packages/kbot/tests/assets/m1.jpg deleted file mode 100644 index 87c199e7..00000000 Binary files a/packages/kbot/tests/assets/m1.jpg and /dev/null differ diff --git a/packages/kbot/tests/assets/m1_gen_0.png b/packages/kbot/tests/assets/m1_gen_0.png index 661da3d7..fc73b079 100644 Binary files a/packages/kbot/tests/assets/m1_gen_0.png and b/packages/kbot/tests/assets/m1_gen_0.png differ