@fgv/ts-app-shell 5.1.0-15 → 5.1.0-17

package/dist/packlets/ai-assist/useAiAssist.js

@@ -19,6 +19,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
 /**
  * Generic AI assist hook — parameterized by settings and keystore, no app-specific context.
  *
@@ -207,13 +214,196 @@ export function useAiAssist(params) {
                     return fail(`AI response validation failed after ${maxAttempts} attempts: ${entityResult.message}`);
                 }
             }
-            // Unreachable, but TypeScript needs it
+            /* c8 ignore next 2 - unreachable: every loop iteration returns; TypeScript needs the trailing return */
             return fail('AI generation failed');
         }
         finally {
             setIsWorking(false);
         }
     }, [settings, keyStore, logger]);
-    return { actions, isWorking, copyPrompt, generateDirect };
+    const generateImages = useCallback(async (provider, params, signal) => {
+        const providerConfig = settings === null || settings === void 0 ? void 0 : settings.providers.find((p) => p.provider === provider);
+        if (!providerConfig) {
+            return fail(`Provider "${provider}" not configured`);
+        }
+        const descriptorResult = AiAssist.getProviderDescriptor(provider);
+        if (descriptorResult.isFailure()) {
+            return fail(descriptorResult.message);
+        }
+        const descriptor = descriptorResult.value;
+        if (descriptor.imageApiFormat === undefined) {
+            return fail(`Provider "${provider}" does not support image generation`);
+        }
+        if (!providerConfig.secretName) {
+            return fail(`Provider "${provider}" has no secret name configured`);
+        }
+        if (!keyStore) {
+            return fail('No keystore available');
+        }
+        const apiKeyResult = keyStore.getApiKey(providerConfig.secretName);
+        if (apiKeyResult.isFailure()) {
+            return fail(`Failed to get API key: ${apiKeyResult.message}`);
+        }
+        setIsWorking(true);
+        try {
+            const requestParams = {
+                descriptor,
+                apiKey: apiKeyResult.value,
+                params,
+                modelOverride: providerConfig.model,
+                logger,
+                signal
+            };
+            const useProxy = !!(settings === null || settings === void 0 ? void 0 : settings.proxyUrl) && (settings.proxyAllProviders === true || descriptor.corsRestricted);
+            const result = useProxy
+                ? await AiAssist.callProxiedImageGeneration(settings.proxyUrl, requestParams)
+                : await AiAssist.callProviderImageGeneration(requestParams);
+            if (result.isFailure()) {
+                logger === null || logger === void 0 ? void 0 : logger.error(`AI image generation failed: ${result.message}`);
+            }
+            return result;
+        }
+        finally {
+            setIsWorking(false);
+        }
+    }, [settings, keyStore, logger]);
+    const listModels = useCallback(async (provider, capability, signal) => {
+        const providerConfig = settings === null || settings === void 0 ? void 0 : settings.providers.find((p) => p.provider === provider);
+        if (!providerConfig) {
+            return fail(`Provider "${provider}" not configured`);
+        }
+        const descriptorResult = AiAssist.getProviderDescriptor(provider);
+        if (descriptorResult.isFailure()) {
+            return fail(descriptorResult.message);
+        }
+        const descriptor = descriptorResult.value;
+        if (!providerConfig.secretName) {
+            return fail(`Provider "${provider}" has no secret name configured`);
+        }
+        if (!keyStore) {
+            return fail('No keystore available');
+        }
+        const apiKeyResult = keyStore.getApiKey(providerConfig.secretName);
+        if (apiKeyResult.isFailure()) {
+            return fail(`Failed to get API key: ${apiKeyResult.message}`);
+        }
+        const requestParams = Object.assign(Object.assign({ descriptor, apiKey: apiKeyResult.value }, (capability !== undefined ? { capability } : {})), { logger,
+            signal });
+        const useProxy = !!(settings === null || settings === void 0 ? void 0 : settings.proxyUrl) && (settings.proxyAllProviders === true || descriptor.corsRestricted);
+        const result = useProxy
+            ? await AiAssist.callProxiedListModels(settings.proxyUrl, requestParams)
+            : await AiAssist.callProviderListModels(requestParams);
+        if (result.isFailure()) {
+            logger === null || logger === void 0 ? void 0 : logger.error(`AI list-models failed: ${result.message}`);
+        }
+        return result;
+    }, [settings, keyStore, logger]);
+    const streamDirect = useCallback(async (provider, prompt, onEvent, options) => {
+        var _a, e_1, _b, _c;
+        const providerConfig = settings === null || settings === void 0 ? void 0 : settings.providers.find((p) => p.provider === provider);
+        if (!providerConfig) {
+            return fail(`Provider "${provider}" not configured`);
+        }
+        const descriptorResult = AiAssist.getProviderDescriptor(provider);
+        if (descriptorResult.isFailure()) {
+            return fail(descriptorResult.message);
+        }
+        const descriptor = descriptorResult.value;
+        if (!providerConfig.secretName) {
+            return fail(`Provider "${provider}" has no secret name configured`);
+        }
+        if (!keyStore) {
+            return fail('No keystore available');
+        }
+        const apiKeyResult = keyStore.getApiKey(providerConfig.secretName);
+        if (apiKeyResult.isFailure()) {
+            return fail(`Failed to get API key: ${apiKeyResult.message}`);
+        }
+        const effectiveTools = AiAssist.resolveEffectiveTools(descriptor, providerConfig.tools, options === null || options === void 0 ? void 0 : options.tools);
+        const requestParams = {
+            descriptor,
+            apiKey: apiKeyResult.value,
+            prompt,
+            messagesBefore: options === null || options === void 0 ? void 0 : options.messagesBefore,
+            modelOverride: providerConfig.model,
+            logger,
+            tools: effectiveTools.length > 0 ? effectiveTools : undefined,
+            signal: options === null || options === void 0 ? void 0 : options.signal
+        };
+        const useProxy = !!(settings === null || settings === void 0 ? void 0 : settings.proxyUrl) && (settings.proxyAllProviders === true || descriptor.streamingCorsRestricted);
+        const openResult = useProxy
+            ? await AiAssist.callProxiedCompletionStream(settings.proxyUrl, requestParams)
+            : await AiAssist.callProviderCompletionStream(requestParams);
+        if (openResult.isFailure()) {
+            logger === null || logger === void 0 ? void 0 : logger.error(`AI streaming failed to start: ${openResult.message}`);
+            return fail(openResult.message);
+        }
+        setIsWorking(true);
+        let fullText = '';
+        let truncated = false;
+        let terminalError;
+        let receivedTerminalEvent = false;
+        try {
+            try {
+                for (var _d = true, _e = __asyncValues(openResult.value), _f; _f = await _e.next(), _a = _f.done, !_a; _d = true) {
+                    _c = _f.value;
+                    _d = false;
+                    const event = _c;
+                    try {
+                        onEvent(event);
+                    }
+                    catch (err) {
+                        // Consumer callback threw (e.g. setState-after-unmount). Convert
+                        // into a terminal failure so streamDirect always resolves to a
+                        // Result instead of rejecting and breaking its contract.
+                        terminalError = `AI stream event handler failed: ${err instanceof Error ? err.message : String(err)}`;
+                        receivedTerminalEvent = true;
+                        break;
+                    }
+                    if (event.type === 'text-delta') {
+                        fullText += event.delta;
+                    }
+                    else if (event.type === 'done') {
+                        fullText = event.fullText;
+                        truncated = event.truncated;
+                        receivedTerminalEvent = true;
+                    }
+                    else if (event.type === 'error') {
+                        terminalError = event.message;
+                        receivedTerminalEvent = true;
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        }
+        finally {
+            setIsWorking(false);
+        }
+        if (terminalError !== undefined) {
+            logger === null || logger === void 0 ? void 0 : logger.error(`AI streaming ended in error: ${terminalError}`);
+            return fail(terminalError);
+        }
+        if (!receivedTerminalEvent) {
+            const message = 'AI stream ended without a terminal done or error event';
+            logger === null || logger === void 0 ? void 0 : logger.error(message);
+            return fail(message);
+        }
+        return succeed({ fullText, truncated });
+    }, [settings, keyStore, logger]);
+    return {
+        actions,
+        isWorking,
+        copyPrompt,
+        generateDirect,
+        generateImages,
+        listModels,
+        streamDirect
+    };
 }
 //# sourceMappingURL=useAiAssist.js.map

package/lib/packlets/ai-assist/useAiAssist.d.ts

@@ -57,6 +57,32 @@ export interface IUseAiAssistResult {
      * @returns Success with the validated entity, or failure.
      */
     readonly generateDirect: <TEntity>(provider: AiAssist.AiProviderId, prompt: AiAssist.AiPrompt, convert: (from: unknown) => Result<TEntity>, tools?: ReadonlyArray<AiAssist.AiServerToolConfig>) => Promise<Result<IAiAssistResult<TEntity>>>;
+    /**
+     * Execute an image-generation action: calls the provider's image API and
+     * returns the generated images.
+     * @returns Success with the image generation response, or failure.
+     */
+    readonly generateImages: (provider: AiAssist.AiProviderId, params: AiAssist.IAiImageGenerationParams, signal?: AbortSignal) => Promise<Result<AiAssist.IAiImageGenerationResponse>>;
+    /**
+     * List the models available from a provider, optionally filtered by capability.
+     * @returns Success with the resolved model list, or failure (no silent fallback).
+     */
+    readonly listModels: (provider: AiAssist.AiProviderId, capability?: AiAssist.AiModelCapability, signal?: AbortSignal) => Promise<Result<ReadonlyArray<AiAssist.IAiModelInfo>>>;
+    /**
+     * Stream a chat completion from the provider. The `onEvent` callback fires
+     * for every event (text deltas, tool progress, errors); the returned
+     * promise resolves with the aggregated final text and truncation flag on
+     * success, or with `Result.fail` when the stream couldn't be started or
+     * ended in a terminal error event.
+     */
+    readonly streamDirect: (provider: AiAssist.AiProviderId, prompt: AiAssist.AiPrompt, onEvent: (event: AiAssist.IAiStreamEvent) => void, options?: {
+        readonly tools?: ReadonlyArray<AiAssist.AiServerToolConfig>;
+        readonly messagesBefore?: ReadonlyArray<AiAssist.IChatMessage>;
+        readonly signal?: AbortSignal;
+    }) => Promise<Result<{
+        readonly fullText: string;
+        readonly truncated: boolean;
+    }>>;
 }
 /**
  * Checks whether a parsed AI response is an error object (with an "error" field)

package/lib/packlets/ai-assist/useAiAssist.js

@@ -20,6 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkForAiErrorObject = checkForAiErrorObject;
 exports.useAiAssist = useAiAssist;
@@ -211,13 +218,196 @@ function useAiAssist(params) {
                     return (0, ts_utils_1.fail)(`AI response validation failed after ${maxAttempts} attempts: ${entityResult.message}`);
                 }
             }
-            // Unreachable, but TypeScript needs it
+            /* c8 ignore next 2 - unreachable: every loop iteration returns; TypeScript needs the trailing return */
             return (0, ts_utils_1.fail)('AI generation failed');
         }
         finally {
             setIsWorking(false);
         }
     }, [settings, keyStore, logger]);
-    return { actions, isWorking, copyPrompt, generateDirect };
+    const generateImages = (0, react_1.useCallback)(async (provider, params, signal) => {
+        const providerConfig = settings === null || settings === void 0 ? void 0 : settings.providers.find((p) => p.provider === provider);
+        if (!providerConfig) {
+            return (0, ts_utils_1.fail)(`Provider "${provider}" not configured`);
+        }
+        const descriptorResult = ts_extras_1.AiAssist.getProviderDescriptor(provider);
+        if (descriptorResult.isFailure()) {
+            return (0, ts_utils_1.fail)(descriptorResult.message);
+        }
+        const descriptor = descriptorResult.value;
+        if (descriptor.imageApiFormat === undefined) {
+            return (0, ts_utils_1.fail)(`Provider "${provider}" does not support image generation`);
+        }
+        if (!providerConfig.secretName) {
+            return (0, ts_utils_1.fail)(`Provider "${provider}" has no secret name configured`);
+        }
+        if (!keyStore) {
+            return (0, ts_utils_1.fail)('No keystore available');
+        }
+        const apiKeyResult = keyStore.getApiKey(providerConfig.secretName);
+        if (apiKeyResult.isFailure()) {
+            return (0, ts_utils_1.fail)(`Failed to get API key: ${apiKeyResult.message}`);
+        }
+        setIsWorking(true);
+        try {
+            const requestParams = {
+                descriptor,
+                apiKey: apiKeyResult.value,
+                params,
+                modelOverride: providerConfig.model,
+                logger,
+                signal
+            };
+            const useProxy = !!(settings === null || settings === void 0 ? void 0 : settings.proxyUrl) && (settings.proxyAllProviders === true || descriptor.corsRestricted);
+            const result = useProxy
+                ? await ts_extras_1.AiAssist.callProxiedImageGeneration(settings.proxyUrl, requestParams)
+                : await ts_extras_1.AiAssist.callProviderImageGeneration(requestParams);
+            if (result.isFailure()) {
+                logger === null || logger === void 0 ? void 0 : logger.error(`AI image generation failed: ${result.message}`);
+            }
+            return result;
+        }
+        finally {
+            setIsWorking(false);
+        }
+    }, [settings, keyStore, logger]);
+    const listModels = (0, react_1.useCallback)(async (provider, capability, signal) => {
+        const providerConfig = settings === null || settings === void 0 ? void 0 : settings.providers.find((p) => p.provider === provider);
+        if (!providerConfig) {
+            return (0, ts_utils_1.fail)(`Provider "${provider}" not configured`);
+        }
+        const descriptorResult = ts_extras_1.AiAssist.getProviderDescriptor(provider);
+        if (descriptorResult.isFailure()) {
+            return (0, ts_utils_1.fail)(descriptorResult.message);
+        }
+        const descriptor = descriptorResult.value;
+        if (!providerConfig.secretName) {
+            return (0, ts_utils_1.fail)(`Provider "${provider}" has no secret name configured`);
+        }
+        if (!keyStore) {
+            return (0, ts_utils_1.fail)('No keystore available');
+        }
+        const apiKeyResult = keyStore.getApiKey(providerConfig.secretName);
+        if (apiKeyResult.isFailure()) {
+            return (0, ts_utils_1.fail)(`Failed to get API key: ${apiKeyResult.message}`);
+        }
+        const requestParams = Object.assign(Object.assign({ descriptor, apiKey: apiKeyResult.value }, (capability !== undefined ? { capability } : {})), { logger,
+            signal });
+        const useProxy = !!(settings === null || settings === void 0 ? void 0 : settings.proxyUrl) && (settings.proxyAllProviders === true || descriptor.corsRestricted);
+        const result = useProxy
+            ? await ts_extras_1.AiAssist.callProxiedListModels(settings.proxyUrl, requestParams)
+            : await ts_extras_1.AiAssist.callProviderListModels(requestParams);
+        if (result.isFailure()) {
+            logger === null || logger === void 0 ? void 0 : logger.error(`AI list-models failed: ${result.message}`);
+        }
+        return result;
+    }, [settings, keyStore, logger]);
+    const streamDirect = (0, react_1.useCallback)(async (provider, prompt, onEvent, options) => {
+        var _a, e_1, _b, _c;
+        const providerConfig = settings === null || settings === void 0 ? void 0 : settings.providers.find((p) => p.provider === provider);
+        if (!providerConfig) {
+            return (0, ts_utils_1.fail)(`Provider "${provider}" not configured`);
+        }
+        const descriptorResult = ts_extras_1.AiAssist.getProviderDescriptor(provider);
+        if (descriptorResult.isFailure()) {
+            return (0, ts_utils_1.fail)(descriptorResult.message);
+        }
+        const descriptor = descriptorResult.value;
+        if (!providerConfig.secretName) {
+            return (0, ts_utils_1.fail)(`Provider "${provider}" has no secret name configured`);
+        }
+        if (!keyStore) {
+            return (0, ts_utils_1.fail)('No keystore available');
+        }
+        const apiKeyResult = keyStore.getApiKey(providerConfig.secretName);
+        if (apiKeyResult.isFailure()) {
+            return (0, ts_utils_1.fail)(`Failed to get API key: ${apiKeyResult.message}`);
+        }
+        const effectiveTools = ts_extras_1.AiAssist.resolveEffectiveTools(descriptor, providerConfig.tools, options === null || options === void 0 ? void 0 : options.tools);
+        const requestParams = {
+            descriptor,
+            apiKey: apiKeyResult.value,
+            prompt,
+            messagesBefore: options === null || options === void 0 ? void 0 : options.messagesBefore,
+            modelOverride: providerConfig.model,
+            logger,
+            tools: effectiveTools.length > 0 ? effectiveTools : undefined,
+            signal: options === null || options === void 0 ? void 0 : options.signal
+        };
+        const useProxy = !!(settings === null || settings === void 0 ? void 0 : settings.proxyUrl) && (settings.proxyAllProviders === true || descriptor.streamingCorsRestricted);
+        const openResult = useProxy
+            ? await ts_extras_1.AiAssist.callProxiedCompletionStream(settings.proxyUrl, requestParams)
+            : await ts_extras_1.AiAssist.callProviderCompletionStream(requestParams);
+        if (openResult.isFailure()) {
+            logger === null || logger === void 0 ? void 0 : logger.error(`AI streaming failed to start: ${openResult.message}`);
+            return (0, ts_utils_1.fail)(openResult.message);
+        }
+        setIsWorking(true);
+        let fullText = '';
+        let truncated = false;
+        let terminalError;
+        let receivedTerminalEvent = false;
+        try {
+            try {
+                for (var _d = true, _e = __asyncValues(openResult.value), _f; _f = await _e.next(), _a = _f.done, !_a; _d = true) {
+                    _c = _f.value;
+                    _d = false;
+                    const event = _c;
+                    try {
+                        onEvent(event);
+                    }
+                    catch (err) {
+                        // Consumer callback threw (e.g. setState-after-unmount). Convert
+                        // into a terminal failure so streamDirect always resolves to a
+                        // Result instead of rejecting and breaking its contract.
+                        terminalError = `AI stream event handler failed: ${err instanceof Error ? err.message : String(err)}`;
+                        receivedTerminalEvent = true;
+                        break;
+                    }
+                    if (event.type === 'text-delta') {
+                        fullText += event.delta;
+                    }
+                    else if (event.type === 'done') {
+                        fullText = event.fullText;
+                        truncated = event.truncated;
+                        receivedTerminalEvent = true;
+                    }
+                    else if (event.type === 'error') {
+                        terminalError = event.message;
+                        receivedTerminalEvent = true;
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        }
+        finally {
+            setIsWorking(false);
+        }
+        if (terminalError !== undefined) {
+            logger === null || logger === void 0 ? void 0 : logger.error(`AI streaming ended in error: ${terminalError}`);
+            return (0, ts_utils_1.fail)(terminalError);
+        }
+        if (!receivedTerminalEvent) {
+            const message = 'AI stream ended without a terminal done or error event';
+            logger === null || logger === void 0 ? void 0 : logger.error(message);
+            return (0, ts_utils_1.fail)(message);
+        }
+        return (0, ts_utils_1.succeed)({ fullText, truncated });
+    }, [settings, keyStore, logger]);
+    return {
+        actions,
+        isWorking,
+        copyPrompt,
+        generateDirect,
+        generateImages,
+        listModels,
+        streamDirect
+    };
 }
 //# sourceMappingURL=useAiAssist.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fgv/ts-app-shell",
-  "version": "5.1.0-15",
+  "version": "5.1.0-17",
   "description": "Shared React UI primitives for application shells: column cascade, sidebar, toast/log messages, command palette, keybinding registry",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -17,8 +17,8 @@
   "dependencies": {
     "@heroicons/react": "~2.2.0",
     "tslib": "^2.8.1",
-    "@fgv/ts-utils": "5.1.0-15",
-    "@fgv/ts-extras": "5.1.0-15"
+    "@fgv/ts-utils": "5.1.0-17",
+    "@fgv/ts-extras": "5.1.0-17"
   },
   "peerDependencies": {
     "react": ">=18.0.0",
@@ -51,8 +51,8 @@
     "@rushstack/heft-jest-plugin": "1.2.6",
     "@testing-library/dom": "^10.4.0",
     "@rushstack/heft-node-rig": "2.11.27",
-    "@fgv/ts-utils-jest": "5.1.0-15",
-    "@fgv/heft-dual-rig": "5.1.0-15"
+    "@fgv/heft-dual-rig": "5.1.0-17",
+    "@fgv/ts-utils-jest": "5.1.0-17"
   },
   "exports": {
     ".": {