@wix/himalaya-cli 0.1378.0 → 0.1380.0

package/templates/owner-lite/tier5-src/_shared/aria-widget-oauth.ts

@@ -0,0 +1,42 @@
+import type { Disclose, WidgetView } from "./aria-widget-view.js";
+import { isWebUrl } from "./aria-widget-model.js";
+
+export interface OAuthCopy {
+  title: string; body: string; pending: string; authorize: string; decline: string;
+  done: string; authorized: string; declined: string; openFailed: string;
+}
+
+export const DEFAULT_OAUTH_COPY: OAuthCopy = {
+  title: "Connect an account", body: "Authorize access to continue this task.",
+  pending: "Finish authorization in your browser, then return and choose Done.",
+  authorize: "Authorize", decline: "Decline", done: "Done",
+  authorized: "Authorized", declined: "Declined",
+  openFailed: "Couldn't open authorization. Try again or decline.",
+};
+
+// These instructions are wire content from the native Aria client, not copy.
+export const OAUTH_AUTHORIZED_NOTE = "The user completed the OAuth authorization flow. Please retry the previous tool call.";
+export const OAUTH_DECLINED_NOTE = "The user declined OAuth authorization. Do not retry the tool.";
+
+/** A browser-open result is not an OAuth callback. Only the owner's subsequent
+ * Done action sends completion. The destination is disclosed by the same helper
+ * as every other widget URL; no guessed server callback is invoked. */
+export function oauthView(
+  view: WidgetView, rawUrl: string, disclose: Disclose,
+  copy: OAuthCopy = DEFAULT_OAUTH_COPY, phase: "pending" | "authorizing" = "pending",
+): WidgetView {
+  const url = isWebUrl(rawUrl.trim()) ? rawUrl.trim() : "";
+  const authorizing = phase === "authorizing" && !!url;
+  return {
+    ...view, notice: "", noticeHidden: true, hidden: false, oauthPhase: authorizing ? "authorizing" : "pending",
+    oauthAuthorizationUrl: url,
+    title: copy.title, titleHidden: !copy.title,
+    text: authorizing ? copy.pending : copy.body, textHidden: false,
+    primaryLabel: authorizing ? copy.done : disclose({ label: copy.authorize, url }),
+    primaryUrl: authorizing ? "" : url,
+    primaryHidden: !url, primaryDisabled: false, primaryEnabled: true,
+    primaryRespondText: authorizing ? `${copy.authorized}\n<HIDDEN>${OAUTH_AUTHORIZED_NOTE}</HIDDEN>` : "",
+    secondaryLabel: copy.decline, secondaryHidden: false, secondaryUrl: "",
+    secondaryRespondText: `${copy.declined}\n<HIDDEN>${OAUTH_DECLINED_NOTE}</HIDDEN>`,
+  };
+}

package/templates/owner-lite/tier5-src/_shared/aria-widget-view.ts

@@ -14,6 +14,7 @@
 
 import type { NormalizedWidget, WidgetKind, WidgetOption } from "./aria-widget-model.js";
 import { SELECTED_TOKEN, VALUES_TOKEN, isWebUrl, stripMarkdown } from "./aria-widget-model.js";
+import { oauthView } from "./aria-widget-oauth.js";
 import { composeGenericCard } from "./aria-generic-widget.js";
 import { normalizeWidget } from "./aria-widget-kinds.js";
 import { scanEnvelopes, widgetsOfParts } from "./aria-widgets.js";
@@ -127,6 +128,8 @@ export interface WidgetStep {
 /** The active widget, as the screen reads it. */
 export interface WidgetView {
   kind: WidgetCase;
+  oauthPhase?: "pending" | "authorizing";
+  oauthAuthorizationUrl?: string;
   /** Transcript row that owns this widget; prevents state carrying into a later
    *  identical-looking ask. */
   sourceMessageId?: string;
@@ -1021,6 +1024,9 @@ export function viewOf(
   // A questionnaire is shown one question at a time; its on-screen fields are
   // derived, never stored, so they start from the same function every later
   // change goes through. The worker re-derives with its own copy.
+  if (w.kind === "OAUTH_REQUIRED") {
+    return oauthView(view, typeof extra.authorizationUrl === "string" ? extra.authorizationUrl : "", disclose);
+  }
   return w.kind === "QUESTIONNAIRE"
     ? questionnaireSynced(view, 0, DEFAULT_QUESTIONNAIRE_COPY, false)
     : view;

package/templates/owner-lite/tier5-src/himi-owner-lite-aria/index.ts

@@ -248,6 +248,17 @@ const core = createAriaChat({
     // sentence around it is localized.
     mentionItemsFailed: (category: string) =>
       copyTemplate("ownerAria.mention.itemsFailed", "Couldn't load {category}.", { category }),
+    oauth: {
+      title: () => copyParam("ownerAria.oauth.title", "Connect an account"),
+      body: () => copyParam("ownerAria.oauth.body", "Authorize access to continue this task."),
+      pending: () => copyParam("ownerAria.oauth.pending", "Finish authorization in your browser, then return and choose Done."),
+      authorize: () => copyParam("ownerAria.oauth.authorize", "Authorize"),
+      decline: () => copyParam("ownerAria.oauth.decline", "Decline"),
+      done: () => copyParam("ownerAria.oauth.done", "Done"),
+      authorized: () => copyParam("ownerAria.oauth.authorized", "Authorized"),
+      declined: () => copyParam("ownerAria.oauth.declined", "Declined"),
+      openFailed: () => copyParam("ownerAria.oauth.openFailed", "Couldn't open authorization. Try again or decline."),
+    },
     widgetItemsFailed: () => copyParam("ownerAria.widget.itemsFailed", "Couldn't load these items."),
     widgetItemsUnavailable: () => copyParam("ownerAria.widget.itemsUnavailable", "Items aren't available here."),
     attachUploading: () => copyParam("ownerAria.attach.uploading", "Uploading…"),
@@ -432,7 +443,7 @@ const svc = defineService<AriaChatState, {
   // moved on must not commit its pre-await snapshot over the new one.
   copyMessage: (s: AriaChatState, arg?: AriaActionArg) => Promise<AriaChatState | undefined>;
   regenerate: (s: AriaChatState) => Promise<AriaChatState>;
-  widgetPrimary: (s: AriaChatState) => Promise<AriaChatState>;
+  widgetPrimary: (s: AriaChatState) => Promise<AriaChatState | undefined>;
   widgetSecondary: (s: AriaChatState) => Promise<AriaChatState>;
   widgetToggle: (s: AriaChatState, arg?: AriaActionArg) => AriaChatState;
   widgetSelectOne: (s: AriaChatState, arg?: AriaActionArg) => AriaChatState;

package/templates/podcast-creator/config.ts

@@ -93,6 +93,13 @@ export default defineApp({
         "parentScreenId": "himi_account",
         "tabId": "profile"
       },
+      {
+        "screenId": "himi_wallet",
+        "isPublic": false,
+        "paramKeys": [],
+        "parentScreenId": "himi_account",
+        "tabId": "profile"
+      },
       {
         "screenId": "himi_plans",
         "isPublic": true,