more backlog items

OpenJibo/docs/development-plan.md

@@ -182,13 +182,19 @@ Latest clock discovery findings:
 - `@be/clock` is a real local skill with `clock`, `timer`, and `alarm` domains.
 - Menu launches use `intent = "menu"` with `entities.domain` set to the target sub-area.
 - Direct timer and alarm actions use `timerValue` and `alarmValue` utterances, not a generic chat path.
-- A practical first OpenJibo slice is therefore: keep custom spoken time/date answers for now, but route `open clock`, `open timer`, `open alarm`, `set a timer ...`, and `set an alarm ...` through stock-shaped local `@be/clock` handoffs.
+- The newest `.NET` pass now routes `open the clock` into the direct `askForTime` clock-view path, moves plain time/date/day questions onto stock-shaped local `@be/clock` handoffs, and keeps malformed timer/alarm requests on a clarification reply path instead of generic chat echo.
 
 Latest photo discovery findings:
 
 - `@be/gallery` is the local gallery browser and opens from `intent = "menu"`.
 - `snapshot` and `photobooth` are not gallery submodes; stock main-menu logic remaps them into `@be/create` with `createOnePhoto` and `createSomePhotos`.
-- A practical first OpenJibo photo slice is therefore: route `open photo gallery` to `@be/gallery`, route `snap a picture` to `@be/create/createOnePhoto`, and route `open photobooth` to `@be/create/createSomePhotos`.
+- The newest `.NET` pass keeps that routing, adds local-file persistence for media metadata, and serves stored media URLs back through `/media/{path}` as a first hosted-gallery slice.
+- The remaining gap is binary fidelity: the current HTTP capture path stores request bodies as text, which is enough to preserve metadata and a placeholder payload, but may still be too lossy for perfect thumbnails/original fetches.
+
+Latest update and state findings:
+
+- unstaged update queries should not fabricate placeholder no-op manifests, because stock settings logic can treat any returned object like a pending update
+- the hosted `.NET` cloud now persists update/media/backups state to a local state file by default, which is a better bridge toward Azure SQL / Blob storage than the old process-memory-only behavior
 
 ## Speech, Animation, And ESML
 

OpenJibo/docs/feature-backlog.md

@@ -132,9 +132,10 @@ Parallel tags:
   - compare our custom time/date path against actual menu payloads
   - decide whether timer and alarm should stay robot-local with cloud acknowledgement, or whether cloud needs to shape the launch and follow-up turns
 - Progress so far:
-  - voice `open clock`, `open timer`, and `open alarm` now synthesize stock-shaped local `@be/clock` launches
-  - voice `set a timer for five minutes` and `set an alarm for 7:30 am` now emit direct `timerValue` / `alarmValue` payloads with the domain and value entities the local skill expects
-  - time/date remain on the existing custom cloud reply path for now
+  - voice `open the clock` now routes to the direct local `askForTime` clock-view path instead of the broader clock menu
+  - voice `what time is it`, `what's today's date`, and `what day is it` now use stock-shaped local `@be/clock` handoffs instead of custom cloud-only speech
+  - voice `set a timer for five minutes`, `set an alarm for 7:30 am`, `set an alarm for 830`, and `set an alarm for 8 30` now emit direct `timerValue` / `alarmValue` payloads with the entities the local skill expects
+  - partial timer/alarm requests such as `set a timer` and `set an alarm` now stay on a controlled clarification reply path instead of drifting into Nimbus/chat echo
 - Exit criteria:
   - time/date behavior stays correct
   - timer and alarm launch or set correctly from both menu and voice where applicable
@@ -158,10 +159,13 @@ Parallel tags:
   - voice `open photo gallery` now launches local `@be/gallery` with a stock-shaped `menu` handoff
   - voice `snap a picture` now launches local `@be/create` with `createOnePhoto`
   - voice `open photobooth` now launches local `@be/create` with `createSomePhotos`
+  - media and update metadata now persist to a local state file in the hosted `.NET` path, so gallery and staged update state are no longer strictly process-memory-only
+  - `Media.Create` now retains uploaded metadata plus a best-effort raw body placeholder and serves the same media URL back through `/media/{path}`
 - Open questions:
   - whether stock Jibo treats captured media as a short-lived local cache until cloud upload completes
   - what binary upload path and metadata are needed so gallery content persists instead of aging out locally
   - whether hosted OpenJibo should store originals, thumbnails, or both
+  - whether the current lossy HTTP body capture is enough for stock gallery thumbnails, or whether we need a binary-safe upload persistence path next
 - Exit criteria:
   - known photo menu and voice phrases map to the correct local path
   - capture storage expectations are documented for laptop versus hosted testing
@@ -179,6 +183,9 @@ Parallel tags:
   - inspect how OpenJibo advertises update manifests so the robot does not repeatedly think an update exists when nothing meaningful is pending
   - prove one successful backup path, one successful update delivery path, and one successful restore path
   - document the operator steps, risk boundaries, and recovery expectations before broader rollout
+- Latest progress:
+  - unstaged update queries no longer fabricate a placeholder no-op manifest, which should reduce the phantom `always has updates` behavior during normal operation
+  - real staged updates can still be created explicitly through the protocol layer when we are ready to prove end-to-end delivery
 - Exit criteria:
   - no phantom "always has updates" behavior in normal operation
   - one controlled update can be delivered successfully
@@ -318,9 +325,75 @@ Parallel tags:
 - Questions to answer:
   - Can we find in the original source evidence for this skill or stop word phrase?
 
+### 18. Volume Up / Volume Down Voice Control
+- Status: `ready`
+- Tags: `protocol`
+- Why later: this is a simple, high-value device-control command that should feel native once the local payload shape is confirmed.
+- User goals:
+  - `turn it up`
+  - `turn it down`
+  - `increase the volume`
+  - `decrease the volume`
+- Current evidence:
+  - stock Jibo exposes volume control through the robot UX, so there should be an existing local path or service contract we can mirror
+  - this belongs with the other lightweight voice device controls rather than generic cloud chat
+- Implementation notes:
+  - inspect the stock `@be` inventory and captures for volume-related intents, rules, or settings hooks
+  - prefer a local robot control payload over synthetic cloud speech
+  - decide whether first pass should support relative changes only, or also absolute requests like `set volume to 5`
+- Exit criteria:
+  - voice increase and decrease commands adjust the robot volume reliably
+  - the behavior feels local and immediate, not like a chat reply
+
+### 19. How Old Are You / Robot Age Persona
+- Status: `discovery`
+- Tags: `protocol`, `content`
+- Why later: this is a strong personality/detail feature, but it may depend on first-power-up metadata or a stock persona path we have not mapped yet.
+- User goals:
+  - `how old are you`
+  - age replies that sound like stock Jibo, including first-boot date and zodiac/personality flavor when available
+- Current evidence:
+  - observed stock-style response from a YouTube transcript:
+    - `I was first powered up on January 31st, 2018, which makes me five days old. I'm an Aquarius.`
+  - this suggests the answer may be based on a stored first-powered-up date, not just a fixed build timestamp
+- Implementation notes:
+  - inspect the stock `@be` inventory and captures for age, birthday, zodiac, or first-contact metadata hooks
+  - decide whether the first OpenJibo slice should:
+    - use stored robot first-boot / first-cloud-seen metadata
+    - compute age dynamically from that date
+    - optionally add zodiac flavor from the same date
+  - if no stock path is found, provide a cloud-powered fallback that still sounds native
+- Exit criteria:
+  - `how old are you` returns a stable, personality-consistent answer
+  - the answer is grounded in stored robot lifecycle data instead of a hard-coded line
+
+### 20. Command Vs Question Reply Style
+- Status: `ready`
+- Tags: `content`, `polish`
+- Why later: Jibo historically responded differently when you commanded a skill versus when you asked about liking or wanting to do that skill, and that conversational nuance is part of what made him feel smart.
+- User goals:
+  - `dance` or `do a dance` should sound like a willing action reply, then perform the skill
+  - `do you like to dance` should sound like an answer to the question first, not the same canned command reply
+- Current evidence:
+  - observed behavior from stock Jibo:
+    - command-style `dance` -> something like `I like to dance` then dance
+    - question-style `do you like to dance?` -> something like `You bet I do`
+  - current OpenJibo skill replies are mostly canned by skill, without distinguishing question intent versus imperative intent
+- Implementation notes:
+  - evolve simple reply collections into structured variants such as:
+    - `commandReplies`
+    - `questionReplies`
+    - optional `confirmationReplies`
+  - add a lightweight classifier for imperative versus question tone before reaching for a full LLM
+  - start with `dance`, then reuse the pattern for other expressive skills where stock Jibo clearly answered differently depending on phrasing
+  - keep the first version rule-based and cheap so it still works well before a future LLM-backed layer exists
+- Exit criteria:
+  - at least one skill family such as `dance` gives distinct replies for command versus question forms
+  - the approach is reusable for other skill reply families without a large rewrite
+
 ## Support Tracks
 
-### 18. Hosted Capture And Storage Plan
+### 21. Hosted Capture And Storage Plan
 
 - Status: `ready`
 - Tags: `docs`
@@ -329,7 +402,7 @@ Parallel tags:
   - define a clean boundary between local capture sinks and hosted archival/export
   - document how group testers should submit sessions without touching repo paths directly
 
-### 19. STT Upgrade And Noise Screening
+### 22. STT Upgrade And Noise Screening
 
 - Status: `ready`
 - Tags: `stt`
@@ -359,4 +432,8 @@ Parallel tags:
 14. Personal report, calendar, and commute
 15. Who Am I / identity management
 16. Onboarding / loop management / fresh start
-17. Hosted capture/storage and STT improvements as parallel tracks
+17. Stop command
+18. Volume up / volume down voice control
+19. How old are you / robot age persona
+20. Command vs question reply style
+21. Hosted capture/storage and STT improvements as parallel tracks

OpenJibo/src/Jibo.Cloud/dotnet/README.md

@@ -124,6 +124,9 @@ Current raw-audio behavior is still a compatibility bridge:
 - hotphrase `[BLANK_AUDIO]` cleanup turns are ignored instead of reopening the cloud into a stale blank-audio comment path after word-of-the-day completion
 - phrase matching has been widened slightly for known test prompts such as joke, dance, surprise, weather, calendar, commute, and news variants
 - time replies now use the natural hour format without a leading zero
+- plain time/date/day questions now travel through stock-shaped local `@be/clock` handoffs, and `open the clock` uses the direct clock-view path instead of the menu path
+- timer/alarm voice launches now accept compact alarm forms like `830` and `8 30`, and malformed timer/alarm requests stay on a clarification reply instead of generic cloud chat
+- media and update metadata now persist to a local state file so gallery/update behavior is not lost on every process restart
 
 ## Buffered Audio STT
 
@@ -167,6 +170,12 @@ Capture-storage guidance while moving toward hosted group testing:
 - hosted deployments should keep runtime request handling decoupled from long-term capture retention
 - sanitized fixtures remain the preferred durable artifact for parity work and bug reproduction
 
+Current local state persistence:
+
+- default path: `App_Data/cloud-state.json` under the running API directory
+- current contents: media metadata, backup metadata, and staged update metadata
+- current limitation: media bodies are only preserved through the existing text-based HTTP body capture seam, so this is a hosted-gallery bridge, not final binary-safe media storage
+
 ## Current Interaction Paths
 
 The working cloud model currently looks like three main paths:

OpenJibo/src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Application/Abstractions/ICloudStateStore.cs

@@ -14,7 +14,7 @@ public interface ICloudStateStore
     CloudSession? FindSessionByToken(string token);
     IReadOnlyList<LoopRecord> GetLoops();
     IReadOnlyList<UpdateManifest> ListUpdates(string? subsystem = null, string? filter = null);
-    UpdateManifest GetUpdateFrom(string? subsystem, string? fromVersion, string? filter);
+    UpdateManifest? GetUpdateFrom(string? subsystem, string? fromVersion, string? filter);
     UpdateManifest CreateUpdate(string? fromVersion, string? toVersion, string? changes, string? shaHash, long? length, string? subsystem, string? filter, IDictionary<string, object?>? dependencies);
     UpdateManifest RemoveUpdate(string? updateId);
     IReadOnlyList<MediaRecord> ListMedia(IReadOnlyList<string>? loopIds = null, long? after = null, long? before = null);

OpenJibo/src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Application/Abstractions/IJiboExperienceContentRepository.cs

@@ -19,4 +19,5 @@ public sealed class JiboExperienceCatalog
     public IReadOnlyList<string> NewsReplies { get; init; } = [];
     public IReadOnlyList<string> NewsBriefings { get; init; } = [];
     public IReadOnlyList<string> GenericFallbackReplies { get; init; } = [];
+    public IReadOnlyList<string> DanceReplies { get; init; } = [];
 }

OpenJibo/src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Application/Services/DemoConversationBroker.cs

@@ -74,6 +74,10 @@ public sealed class DemoConversationBroker(JiboInteractionService interactionSer
             "word_of_the_day_guess" => false,
             "radio" => false,
             "radio_genre" => false,
+            "time" => false,
+            "date" => false,
+            "day" => false,
+            "clock_open" => false,
             "clock_menu" => false,
             "timer_menu" => false,
             "alarm_menu" => false,

OpenJibo/src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Application/Services/JiboCloudProtocolService.cs

@@ -29,6 +29,12 @@ public sealed class JiboCloudProtocolService(ICloudStateStore stateStore)
             return Task.FromResult(ProtocolDispatchResult.Ok(new { ok = true, host = envelope.HostName }));
         }
 
+        if (envelope.Method.Equals("GET", StringComparison.OrdinalIgnoreCase) &&
+            envelope.Path.StartsWith("/media/", StringComparison.OrdinalIgnoreCase))
+        {
+            return Task.FromResult(HandleMediaContent(envelope));
+        }
+
         if (envelope.Method.Equals("PUT", StringComparison.OrdinalIgnoreCase) &&
             (envelope.Path.Equals("/upload/asr-binary", StringComparison.OrdinalIgnoreCase) ||
              envelope.Path.Equals("/upload/log-events", StringComparison.OrdinalIgnoreCase) ||
@@ -383,7 +389,13 @@ public sealed class JiboCloudProtocolService(ICloudStateStore stateStore)
             var type = ReadHeader(envelope, "x-type") ?? ReadString(body, "type") ?? "unknown";
             var reference = ReadHeader(envelope, "x-reference") ?? ReadString(body, "reference") ?? string.Empty;
             var isEncrypted = ReadBooleanHeader(envelope, "x-encrypted") || ReadBool(body, "isEncrypted");
-            var meta = ReadObject(body, "meta");
+            var meta = ReadObject(body, "meta") ?? new Dictionary<string, object?>(StringComparer.OrdinalIgnoreCase);
+            var contentType = ReadHeader(envelope, "Content-Type") ?? "application/octet-stream";
+            meta["contentType"] = contentType;
+            if (!string.IsNullOrWhiteSpace(envelope.BodyText))
+            {
+                meta["bodyText"] = envelope.BodyText;
+            }
 
             return ProtocolDispatchResult.Ok(MapMedia(stateStore.CreateMedia(loopId, path, type, reference, isEncrypted, meta)));
         }
@@ -530,7 +542,7 @@ public sealed class JiboCloudProtocolService(ICloudStateStore stateStore)
                 .Where(update => fromVersion is null || update.FromVersion.Equals(fromVersion, StringComparison.OrdinalIgnoreCase))
                 .Select(MapUpdate)
                 .ToArray()),
-            "GetUpdateFrom" => ProtocolDispatchResult.Ok(MapUpdate(stateStore.GetUpdateFrom(subsystem, fromVersion, filter))),
+            "GetUpdateFrom" => HandleGetUpdateFrom(subsystem, fromVersion, filter),
             "CreateUpdate" => ProtocolDispatchResult.Ok(MapUpdate(stateStore.CreateUpdate(
                 fromVersion,
                 ReadString(body, "toVersion"),
@@ -545,6 +557,29 @@ public sealed class JiboCloudProtocolService(ICloudStateStore stateStore)
         };
     }
 
+    private ProtocolDispatchResult HandleMediaContent(ProtocolEnvelope envelope)
+    {
+        var path = Uri.UnescapeDataString(envelope.Path["/media/".Length..]);
+        var candidatePaths = new[] { path, $"/{path}" };
+        var media = stateStore.GetMedia(candidatePaths).FirstOrDefault();
+        if (media is null || media.IsDeleted)
+        {
+            return ProtocolDispatchResult.Raw(404, string.Empty);
+        }
+
+        var contentType = TryReadMetaString(media.Meta, "contentType") ?? "application/octet-stream";
+        var bodyText = TryReadMetaString(media.Meta, "bodyText") ?? string.Empty;
+        return ProtocolDispatchResult.Raw(200, bodyText, contentType);
+    }
+
+    private ProtocolDispatchResult HandleGetUpdateFrom(string? subsystem, string? fromVersion, string? filter)
+    {
+        var update = stateStore.GetUpdateFrom(subsystem, fromVersion, filter);
+        return update is null
+            ? ProtocolDispatchResult.Ok(new { })
+            : ProtocolDispatchResult.Ok(MapUpdate(update));
+    }
+
     private static object MapUpdate(UpdateManifest update)
     {
         return new
@@ -575,12 +610,21 @@ public sealed class JiboCloudProtocolService(ICloudStateStore stateStore)
             accountId = item.AccountId,
             loopId = item.LoopId,
             url = item.Url,
+            thumbnailUrl = item.Url,
+            originalUrl = item.Url,
             isEncrypted = item.IsEncrypted,
             isDeleted = item.IsDeleted,
             meta = item.Meta
         };
     }
 
+    private static string? TryReadMetaString(IDictionary<string, object?> meta, string key)
+    {
+        return meta.TryGetValue(key, out var value)
+            ? value?.ToString()
+            : null;
+    }
+
     private static string? ReadString(JsonElement? element, string propertyName)
     {
         if (element is null || !element.Value.TryGetProperty(propertyName, out var property))

OpenJibo/src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Application/Services/JiboInteractionService.cs

@@ -27,18 +27,22 @@ public sealed class JiboInteractionService(
         return semanticIntent switch
         {
             "joke" => BuildJokeDecision(catalog),
-            "dance" => BuildDanceDecision(catalog),
-            "time" => new JiboInteractionDecision("time", $"It is {DateTime.Now:h:mm tt}."),
-            "date" => new JiboInteractionDecision("date", $"Today is {DateTime.Now:dddd, MMMM d}."),
-            "day" => new JiboInteractionDecision("day", $"Today is {DateTime.Now:dddd}."),
+            "dance" => BuildRandomDanceDecision(catalog),
+            "twerk" => BuildDanceDecision("rom-twerk", "Watch me twerk."),
+            "time" => BuildClockLaunchDecision("time", "clock", "askForTime", "Showing the time."),
+            "date" => BuildClockLaunchDecision("date", "clock", "askForDate", "Showing the date."),
+            "day" => BuildClockLaunchDecision("day", "clock", "askForDay", "Showing the day."),
             "cloud_version" => new JiboInteractionDecision("cloud_version", OpenJiboCloudBuildInfo.SpokenVersion),
             "radio" => BuildRadioLaunchDecision(),
             "radio_genre" => BuildRadioGenreLaunchDecision(lowered),
-            "clock_menu" => BuildClockLaunchDecision("clock", "Opening the clock."),
+            "clock_open" => BuildClockLaunchDecision("clock_open", "clock", "askForTime", "Opening the clock."),
+            "clock_menu" => BuildClockLaunchDecision("clock_menu", "clock", "menu", "Opening the clock menu."),
             "timer_menu" => BuildClockLaunchDecision("timer", "Opening the timer."),
             "alarm_menu" => BuildClockLaunchDecision("alarm", "Opening the alarm."),
             "timer_value" => BuildTimerValueDecision(lowered),
             "alarm_value" => BuildAlarmValueDecision(lowered),
+            "timer_clarify" => new JiboInteractionDecision("timer_clarify", "How long should I set the timer for?"),
+            "alarm_clarify" => new JiboInteractionDecision("alarm_clarify", "What time should I set the alarm for?"),
             "photo_gallery" => BuildPhotoGalleryLaunchDecision(),
             "snapshot" => BuildPhotoCreateDecision("snapshot", "Taking a picture.", "createOnePhoto"),
             "photobooth" => BuildPhotoCreateDecision("photobooth", "Starting photobooth.", "createSomePhotos"),
@@ -71,12 +75,18 @@ public sealed class JiboInteractionService(
             });
     }
 
-    private JiboInteractionDecision BuildDanceDecision(JiboExperienceCatalog catalog)
+    private JiboInteractionDecision BuildRandomDanceDecision(JiboExperienceCatalog catalog)
     {
         var dance = randomizer.Choose(catalog.DanceAnimations);
+        var replyText = randomizer.Choose(catalog.DanceReplies);
+        return BuildDanceDecision(dance, replyText);
+    }
+
+    private static JiboInteractionDecision BuildDanceDecision(string dance, string replyText)
+    {
         return new JiboInteractionDecision(
             "dance",
-            "Okay. Watch this.",
+            replyText,
             "chitchat-skill",
             new Dictionary<string, object?>
             {
@@ -236,19 +246,9 @@ public sealed class JiboInteractionService(
             return "radio_genre";
         }
 
-        if (TryParseAlarmValue(loweredTranscript) is not null)
-        {
-            return "alarm_value";
-        }
-
-        if (TryParseTimerValue(loweredTranscript) is not null)
-        {
-            return "timer_value";
-        }
-
         if (MatchesAny(loweredTranscript, "open the clock", "open clock", "show the clock", "show clock"))
         {
-            return "clock_menu";
+            return "clock_open";
         }
 
         if (MatchesAny(loweredTranscript, "open the timer", "open timer", "show the timer", "show timer"))
@@ -261,6 +261,26 @@ public sealed class JiboInteractionService(
             return "alarm_menu";
         }
 
+        if (TryParseAlarmValue(loweredTranscript) is not null)
+        {
+            return "alarm_value";
+        }
+
+        if (TryParseTimerValue(loweredTranscript) is not null)
+        {
+            return "timer_value";
+        }
+
+        if (IsAlarmRequest(loweredTranscript))
+        {
+            return "alarm_clarify";
+        }
+
+        if (IsTimerRequest(loweredTranscript))
+        {
+            return "timer_clarify";
+        }
+
         if (MatchesAny(loweredTranscript, "open the radio", "play the radio", "turn on the radio", "radio"))
         {
             return "radio";
@@ -425,20 +445,25 @@ public sealed class JiboInteractionService(
             });
     }
 
-    private static JiboInteractionDecision BuildClockLaunchDecision(string domain, string replyText)
+    private static JiboInteractionDecision BuildClockLaunchDecision(string intentName, string domain, string clockIntent, string replyText)
     {
         return new JiboInteractionDecision(
-            $"{domain}_menu",
+            intentName,
             replyText,
             "@be/clock",
             new Dictionary<string, object?>(StringComparer.OrdinalIgnoreCase)
             {
                 ["skillId"] = "@be/clock",
                 ["domain"] = domain,
-                ["clockIntent"] = "menu"
+                ["clockIntent"] = clockIntent
             });
     }
 
+    private static JiboInteractionDecision BuildClockLaunchDecision(string domain, string replyText)
+    {
+        return BuildClockLaunchDecision($"{domain}_menu", domain, "menu", replyText);
+    }
+
     private static JiboInteractionDecision BuildTimerValueDecision(string loweredTranscript)
     {
         var timer = TryParseTimerValue(loweredTranscript) ?? new ClockTimerValue("0", "1", "null");
@@ -733,7 +758,33 @@ public sealed class JiboInteractionService(
             return null;
         }
 
-        var match = AlarmPattern.Match(loweredTranscript);
+        var compactMatch = CompactAlarmPattern.Match(loweredTranscript);
+        if (compactMatch.Success)
+        {
+            var compact = compactMatch.Groups["compact"].Value;
+            if (int.TryParse(compact, out var compactValue))
+            {
+                var compactHour = compact.Length switch
+                {
+                    3 => compactValue / 100,
+                    4 => compactValue / 100,
+                    _ => -1
+                };
+                var compactMinute = compact.Length switch
+                {
+                    3 => compactValue % 100,
+                    4 => compactValue % 100,
+                    _ => -1
+                };
+                if (compactHour is >= 1 and <= 12 && compactMinute is >= 0 and <= 59)
+                {
+                    var compactAmPm = ResolveAmPm(compactMatch.Groups["ampm"].Value);
+                    return new ClockAlarmValue($"{compactHour}:{compactMinute:00}", compactAmPm);
+                }
+            }
+        }
+
+        var match = SplitAlarmPattern.Match(loweredTranscript);
         if (!match.Success)
         {
             return null;
@@ -752,10 +803,36 @@ public sealed class JiboInteractionService(
             return null;
         }
 
-        var ampm = match.Groups["ampm"].Value.StartsWith("p", StringComparison.Ordinal) ? "pm" : "am";
+        var ampm = ResolveAmPm(match.Groups["ampm"].Value);
         return new ClockAlarmValue($"{hour}:{minute:00}", ampm);
     }
 
+    private static string ResolveAmPm(string token)
+    {
+        return token.StartsWith("p", StringComparison.OrdinalIgnoreCase) ? "pm" : "am";
+    }
+
+    private static bool IsTimerRequest(string loweredTranscript)
+    {
+        return MatchesAny(
+            loweredTranscript,
+            "set a timer",
+            "set timer",
+            "start a timer",
+            "start timer",
+            "timer for");
+    }
+
+    private static bool IsAlarmRequest(string loweredTranscript)
+    {
+        return MatchesAny(
+            loweredTranscript,
+            "set an alarm",
+            "set alarm",
+            "wake me up",
+            "alarm for");
+    }
+
     private static int? ExtractDurationValue(string loweredTranscript, string unitStem)
     {
         var pattern = new Regex($@"\b(?<value>\d+|[a-z\-]+)\s+{unitStem}s?\b", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
@@ -810,8 +887,12 @@ public sealed class JiboInteractionService(
 
     private sealed record ClockAlarmValue(string Time, string AmPm);
 
-    private static readonly Regex AlarmPattern = new(
-        @"\b(?<hour>\d{1,2}|one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve)(?:[:\s](?<minute>\d{2}))?\s*(?<ampm>a\.?m\.?|p\.?m\.?)\b",
+    private static readonly Regex SplitAlarmPattern = new(
+        @"\b(?<hour>\d{1,2}|one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve)(?:[:\s](?<minute>\d{2}))?\s*(?<ampm>a\.?m\.?|p\.?m\.?)?\b",
+        RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Compiled);
+
+    private static readonly Regex CompactAlarmPattern = new(
+        @"\b(?<compact>\d{3,4})\s*(?<ampm>a\.?m\.?|p\.?m\.?)?\b",
         RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Compiled);
 
     private static readonly (string Phrase, string Station)[] RadioGenreAliases =

OpenJibo/src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Application/Services/OpenJiboCloudBuildInfo.cs

@@ -2,7 +2,7 @@ namespace Jibo.Cloud.Application.Services;
 
 public static class OpenJiboCloudBuildInfo
 {
-    public const string Version = "1.0.11";
+    public const string Version = "1.0.12";
 
     public static string VersionWords => Version.Replace(".", " dot ");
 

OpenJibo/src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Application/Services/WebSocketTurnFinalizationService.cs

@@ -564,6 +564,10 @@ public sealed class WebSocketTurnFinalizationService(
         var emitSkillActions = !string.Equals(plan.IntentName, "word_of_the_day", StringComparison.OrdinalIgnoreCase) &&
                                !string.Equals(plan.IntentName, "radio", StringComparison.OrdinalIgnoreCase) &&
                                !string.Equals(plan.IntentName, "radio_genre", StringComparison.OrdinalIgnoreCase) &&
+                               !string.Equals(plan.IntentName, "time", StringComparison.OrdinalIgnoreCase) &&
+                               !string.Equals(plan.IntentName, "date", StringComparison.OrdinalIgnoreCase) &&
+                               !string.Equals(plan.IntentName, "day", StringComparison.OrdinalIgnoreCase) &&
+                               !string.Equals(plan.IntentName, "clock_open", StringComparison.OrdinalIgnoreCase) &&
                                !string.Equals(plan.IntentName, "clock_menu", StringComparison.OrdinalIgnoreCase) &&
                                !string.Equals(plan.IntentName, "timer_menu", StringComparison.OrdinalIgnoreCase) &&
                                !string.Equals(plan.IntentName, "alarm_menu", StringComparison.OrdinalIgnoreCase) &&

OpenJibo/src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Infrastructure/Content/InMemoryJiboExperienceContentRepository.cs

@@ -23,6 +23,12 @@ public sealed class InMemoryJiboExperienceContentRepository : IJiboExperienceCon
             "rom-electronic",
             "rom-twerk"
         ],
+        DanceReplies = [
+            "I am ready to dance.",
+            "Okay. Watch this.",
+            "Watch me dance.",
+            "Here's my favorite dance move."
+        ],
         GreetingReplies =
         [
             "Hi there. It is really good to talk with you.",

OpenJibo/src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Infrastructure/DependencyInjection/ServiceCollectionExtensions.cs

@@ -7,6 +7,7 @@ using Jibo.Cloud.Infrastructure.Telemetry;
 using Jibo.Runtime.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Configuration;
+using System.IO;
 
 namespace Jibo.Cloud.Infrastructure.DependencyInjection;
 
@@ -24,7 +25,9 @@ public static class ServiceCollectionExtensions
         }
 
         services.AddSingleton(sttOptions);
-        services.AddSingleton<ICloudStateStore, InMemoryCloudStateStore>();
+        var statePersistencePath = configuration?["OpenJibo:State:PersistencePath"]
+            ?? Path.Combine(AppContext.BaseDirectory, "App_Data", "cloud-state.json");
+        services.AddSingleton<ICloudStateStore>(_ => new InMemoryCloudStateStore(statePersistencePath));
         services.AddSingleton<IJiboExperienceContentRepository, InMemoryJiboExperienceContentRepository>();
         services.AddSingleton<JiboExperienceContentCache>();
         services.AddSingleton<IJiboRandomizer, DefaultJiboRandomizer>();

OpenJibo/src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Infrastructure/Persistence/InMemoryCloudStateStore.cs

@@ -1,4 +1,5 @@
 using System.Collections.Concurrent;
+using System.Text.Json;
 using Jibo.Cloud.Application.Abstractions;
 using Jibo.Cloud.Domain.Models;
 
@@ -6,11 +7,18 @@ namespace Jibo.Cloud.Infrastructure.Persistence;
 
 public sealed class InMemoryCloudStateStore : ICloudStateStore
 {
+    private static readonly JsonSerializerOptions PersistenceJsonOptions = new()
+    {
+        WriteIndented = true
+    };
+
     private readonly AccountProfile _account = new();
     private readonly ConcurrentDictionary<string, DeviceRegistration> _devices = new(StringComparer.OrdinalIgnoreCase);
     private readonly ConcurrentDictionary<string, CloudSession> _sessionsByToken = new(StringComparer.OrdinalIgnoreCase);
     private readonly ConcurrentDictionary<string, string> _symmetricKeys = new(StringComparer.OrdinalIgnoreCase);
     private readonly ConcurrentDictionary<string, KeyRequestRecord> _keyRequests = new(StringComparer.OrdinalIgnoreCase);
+    private readonly string? _persistencePath;
+    private readonly object _syncRoot = new();
     private readonly List<UpdateManifest> _updates;
     private readonly List<MediaRecord> _media = [];
     private readonly List<BackupRecord> _backups = [];
@@ -18,8 +26,9 @@ public sealed class InMemoryCloudStateStore : ICloudStateStore
     private DeviceRegistration _robot;
     private RobotProfile _robotProfile;
 
-    public InMemoryCloudStateStore()
+    public InMemoryCloudStateStore(string? persistencePath = null)
     {
+        _persistencePath = persistencePath;
         _robot = new DeviceRegistration
         {
             HostMappings = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
@@ -52,19 +61,8 @@ public sealed class InMemoryCloudStateStore : ICloudStateStore
             }
         ];
 
-        _updates =
-        [
-            new UpdateManifest
-            {
-                UpdateId = "noop-update-robot",
-                FromVersion = "unknown",
-                ToVersion = "unknown",
-                Changes = "No update available",
-                Url = "https://api.jibo.com/update/noop",
-                ShaHash = "noop",
-                Subsystem = "robot"
-            }
-        ];
+        _updates = [];
+        LoadPersistentState();
     }
 
     public AccountProfile GetAccount() => _account;
@@ -159,16 +157,10 @@ public sealed class InMemoryCloudStateStore : ICloudStateStore
             .ToArray();
     }
 
-    public UpdateManifest GetUpdateFrom(string? subsystem, string? fromVersion, string? filter)
+    public UpdateManifest? GetUpdateFrom(string? subsystem, string? fromVersion, string? filter)
     {
-        return ListUpdates(subsystem, filter).FirstOrDefault() ?? new UpdateManifest
-        {
-            UpdateId = $"noop-update-{subsystem ?? "robot"}-{fromVersion ?? "unknown"}",
-            FromVersion = fromVersion ?? "unknown",
-            ToVersion = fromVersion ?? "unknown",
-            Filter = filter,
-            Subsystem = subsystem ?? "robot"
-        };
+        return ListUpdates(subsystem, filter)
+            .FirstOrDefault(update => fromVersion is null || update.FromVersion.Equals(fromVersion, StringComparison.OrdinalIgnoreCase));
     }
 
     public UpdateManifest CreateUpdate(string? fromVersion, string? toVersion, string? changes, string? shaHash, long? length, string? subsystem, string? filter, IDictionary<string, object?>? dependencies)
@@ -187,6 +179,7 @@ public sealed class InMemoryCloudStateStore : ICloudStateStore
         };
 
         _updates.Add(update);
+        PersistState();
         return update;
     }
 
@@ -196,6 +189,7 @@ public sealed class InMemoryCloudStateStore : ICloudStateStore
         if (existing is not null)
         {
             _updates.Remove(existing);
+            PersistState();
             return existing;
         }
 
@@ -212,6 +206,7 @@ public sealed class InMemoryCloudStateStore : ICloudStateStore
     public IReadOnlyList<MediaRecord> ListMedia(IReadOnlyList<string>? loopIds = null, long? after = null, long? before = null)
     {
         return _media
+            .Where(item => !item.IsDeleted)
             .Where(item => loopIds is null || loopIds.Count == 0 || loopIds.Contains(item.LoopId))
             .Where(item => after is null || item.CreatedUtc.ToUnixTimeMilliseconds() > after)
             .Where(item => before is null || item.CreatedUtc.ToUnixTimeMilliseconds() < before)
@@ -251,6 +246,11 @@ public sealed class InMemoryCloudStateStore : ICloudStateStore
             replacements.Add(updated);
         }
 
+        if (replacements.Count > 0)
+        {
+            PersistState();
+        }
+
         return replacements;
     }
 
@@ -268,13 +268,23 @@ public sealed class InMemoryCloudStateStore : ICloudStateStore
             Meta = meta ?? new Dictionary<string, object?>()
         };
 
-        _media.Add(item);
+        var existingIndex = _media.FindIndex(existing => existing.Path.Equals(path, StringComparison.OrdinalIgnoreCase));
+        if (existingIndex >= 0)
+        {
+            _media[existingIndex] = item;
+        }
+        else
+        {
+            _media.Add(item);
+        }
+
+        PersistState();
         return item;
     }
 
     public IReadOnlyList<BackupRecord> GetBackups() => _backups.ToArray();
 
-    public bool ShouldCreateSymmetricKey(string loopId) => true;
+    public bool ShouldCreateSymmetricKey(string loopId) => !_symmetricKeys.ContainsKey(loopId);
 
     public string GetOrCreateSymmetricKey(string loopId)
     {
@@ -350,5 +360,69 @@ public sealed class InMemoryCloudStateStore : ICloudStateStore
             },
             UpdatedUtc = DateTimeOffset.UtcNow
         };
+        PersistState();
+    }
+
+    private void LoadPersistentState()
+    {
+        if (string.IsNullOrWhiteSpace(_persistencePath) || !File.Exists(_persistencePath))
+        {
+            return;
+        }
+
+        try
+        {
+            var snapshot = JsonSerializer.Deserialize<PersistentStateSnapshot>(File.ReadAllText(_persistencePath), PersistenceJsonOptions);
+            if (snapshot is null)
+            {
+                return;
+            }
+
+            _updates.Clear();
+            _updates.AddRange(snapshot.Updates ?? []);
+
+            _media.Clear();
+            _media.AddRange(snapshot.Media ?? []);
+
+            _backups.Clear();
+            _backups.AddRange(snapshot.Backups ?? []);
+        }
+        catch
+        {
+            // Ignore corrupt state and continue with the in-memory defaults.
+        }
+    }
+
+    private void PersistState()
+    {
+        if (string.IsNullOrWhiteSpace(_persistencePath))
+        {
+            return;
+        }
+
+        lock (_syncRoot)
+        {
+            var directory = Path.GetDirectoryName(_persistencePath);
+            if (!string.IsNullOrWhiteSpace(directory))
+            {
+                Directory.CreateDirectory(directory);
+            }
+
+            var snapshot = new PersistentStateSnapshot
+            {
+                Updates = _updates.ToArray(),
+                Media = _media.ToArray(),
+                Backups = _backups.ToArray()
+            };
+
+            File.WriteAllText(_persistencePath, JsonSerializer.Serialize(snapshot, PersistenceJsonOptions));
+        }
+    }
+
+    private sealed class PersistentStateSnapshot
+    {
+        public UpdateManifest[]? Updates { get; init; }
+        public MediaRecord[]? Media { get; init; }
+        public BackupRecord[]? Backups { get; init; }
     }
 }

OpenJibo/tests/Jibo.Cloud.Tests/Protocol/JiboCloudProtocolServiceTests.cs

@@ -46,7 +46,7 @@ public sealed class JiboCloudProtocolServiceTests
     }
 
     [Fact]
-    public async Task GetUpdateFrom_ReturnsNoOpUpdate()
+    public async Task GetUpdateFrom_WithoutStagedUpdate_ReturnsEmptyPayload()
     {
         var result = await _service.DispatchAsync(new ProtocolEnvelope
         {
@@ -59,8 +59,8 @@ public sealed class JiboCloudProtocolServiceTests
 
         using var payload = JsonDocument.Parse(result.BodyText);
         Assert.Equal(200, result.StatusCode);
-        Assert.Equal("robot", payload.RootElement.GetProperty("subsystem").GetString());
-        Assert.True(payload.RootElement.TryGetProperty("url", out _));
+        Assert.Equal(JsonValueKind.Object, payload.RootElement.ValueKind);
+        Assert.Empty(payload.RootElement.EnumerateObject());
     }
 
     [Fact]
@@ -108,6 +108,82 @@ public sealed class JiboCloudProtocolServiceTests
         Assert.Single(fetchedPayload.RootElement.EnumerateArray());
     }
 
+    [Fact]
+    public async Task MediaCreate_PersistsAcrossStoreRecreation_WhenPersistencePathIsConfigured()
+    {
+        var persistencePath = Path.Combine(Path.GetTempPath(), $"openjibo-state-{Guid.NewGuid():N}.json");
+        try
+        {
+            var firstService = new JiboCloudProtocolService(new InMemoryCloudStateStore(persistencePath));
+            await firstService.DispatchAsync(new ProtocolEnvelope
+            {
+                HostName = "api.jibo.com",
+                Method = "POST",
+                ServicePrefix = "Media_20160725",
+                Operation = "Create",
+                Headers = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                {
+                    ["Content-Type"] = "image/jpeg"
+                },
+                BodyText = """{"path":"persisted-photo","type":"image","reference":"photo"}"""
+            });
+
+            var secondService = new JiboCloudProtocolService(new InMemoryCloudStateStore(persistencePath));
+            var listed = await secondService.DispatchAsync(new ProtocolEnvelope
+            {
+                HostName = "api.jibo.com",
+                Method = "POST",
+                ServicePrefix = "Media_20160725",
+                Operation = "List",
+                BodyText = "{}"
+            });
+
+            using var listedPayload = JsonDocument.Parse(listed.BodyText);
+            Assert.Single(listedPayload.RootElement.EnumerateArray());
+            Assert.Equal("persisted-photo", listedPayload.RootElement[0].GetProperty("path").GetString());
+        }
+        finally
+        {
+            if (File.Exists(persistencePath))
+            {
+                File.Delete(persistencePath);
+            }
+        }
+    }
+
+    [Fact]
+    public async Task MediaCreate_StoresBodyAndServesMediaUrl()
+    {
+        var result = await _service.DispatchAsync(new ProtocolEnvelope
+        {
+            HostName = "api.jibo.com",
+            Method = "POST",
+            ServicePrefix = "Media_20160725",
+            Operation = "Create",
+            Headers = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                ["Content-Type"] = "image/jpeg",
+                ["x-path"] = "photo-blob-1",
+                ["x-type"] = "image"
+            },
+            BodyText = "binary-photo-placeholder"
+        });
+
+        using var createdPayload = JsonDocument.Parse(result.BodyText);
+        Assert.Equal("https://api.jibo.com/media/photo-blob-1", createdPayload.RootElement.GetProperty("url").GetString());
+
+        var mediaGet = await _service.DispatchAsync(new ProtocolEnvelope
+        {
+            HostName = "api.jibo.com",
+            Method = "GET",
+            Path = "/media/photo-blob-1"
+        });
+
+        Assert.Equal(200, mediaGet.StatusCode);
+        Assert.Equal("image/jpeg", mediaGet.ContentType);
+        Assert.Equal("binary-photo-placeholder", mediaGet.BodyText);
+    }
+
     [Fact]
     public async Task KeyCreateSymmetricKey_ReturnsKeyPayload()
     {

OpenJibo/tests/Jibo.Cloud.Tests/WebSockets/JiboInteractionServiceTests.cs

@@ -54,7 +54,8 @@ public sealed class JiboInteractionServiceTests
         });
 
         Assert.Equal("date", decision.IntentName);
-        Assert.Contains("Today is", decision.ReplyText, StringComparison.Ordinal);
+        Assert.Equal("@be/clock", decision.SkillName);
+        Assert.Equal("askForDate", decision.SkillPayload!["clockIntent"]);
     }
 
     [Fact]
@@ -198,6 +199,55 @@ public sealed class JiboInteractionServiceTests
         Assert.Equal("menu", decision.SkillPayload["clockIntent"]);
     }
 
+    [Fact]
+    public async Task BuildDecisionAsync_OpenClock_MapsToDirectClockView()
+    {
+        var service = CreateService();
+
+        var decision = await service.BuildDecisionAsync(new TurnContext
+        {
+            RawTranscript = "open the clock",
+            NormalizedTranscript = "open the clock"
+        });
+
+        Assert.Equal("clock_open", decision.IntentName);
+        Assert.Equal("@be/clock", decision.SkillName);
+        Assert.Equal("clock", decision.SkillPayload!["domain"]);
+        Assert.Equal("askForTime", decision.SkillPayload["clockIntent"]);
+    }
+
+    [Fact]
+    public async Task BuildDecisionAsync_WhatTimeIsIt_MapsToLocalClockTimeIntent()
+    {
+        var service = CreateService();
+
+        var decision = await service.BuildDecisionAsync(new TurnContext
+        {
+            RawTranscript = "what time is it",
+            NormalizedTranscript = "what time is it"
+        });
+
+        Assert.Equal("time", decision.IntentName);
+        Assert.Equal("@be/clock", decision.SkillName);
+        Assert.Equal("askForTime", decision.SkillPayload!["clockIntent"]);
+    }
+
+    [Fact]
+    public async Task BuildDecisionAsync_TodaysDate_MapsToLocalClockDateIntent()
+    {
+        var service = CreateService();
+
+        var decision = await service.BuildDecisionAsync(new TurnContext
+        {
+            RawTranscript = "what's today's date",
+            NormalizedTranscript = "what's today's date"
+        });
+
+        Assert.Equal("date", decision.IntentName);
+        Assert.Equal("@be/clock", decision.SkillName);
+        Assert.Equal("askForDate", decision.SkillPayload!["clockIntent"]);
+    }
+
     [Fact]
     public async Task BuildDecisionAsync_SetTimerForFiveMinutes_MapsToTimerValue()
     {
@@ -237,6 +287,70 @@ public sealed class JiboInteractionServiceTests
         Assert.Equal("am", decision.SkillPayload["ampm"]);
     }
 
+    [Fact]
+    public async Task BuildDecisionAsync_SetAlarmForEightThirty_ParsesCompactTime()
+    {
+        var service = CreateService();
+
+        var decision = await service.BuildDecisionAsync(new TurnContext
+        {
+            RawTranscript = "set an alarm for 830",
+            NormalizedTranscript = "set an alarm for 830"
+        });
+
+        Assert.Equal("alarm_value", decision.IntentName);
+        Assert.Equal("8:30", decision.SkillPayload!["time"]);
+        Assert.Equal("am", decision.SkillPayload["ampm"]);
+    }
+
+    [Fact]
+    public async Task BuildDecisionAsync_SetAlarmForEightThirtySpokenDigits_ParsesSplitTime()
+    {
+        var service = CreateService();
+
+        var decision = await service.BuildDecisionAsync(new TurnContext
+        {
+            RawTranscript = "set an alarm for 8 30",
+            NormalizedTranscript = "set an alarm for 8 30"
+        });
+
+        Assert.Equal("alarm_value", decision.IntentName);
+        Assert.Equal("8:30", decision.SkillPayload!["time"]);
+        Assert.Equal("am", decision.SkillPayload["ampm"]);
+    }
+
+    [Fact]
+    public async Task BuildDecisionAsync_SetAlarmWithoutTime_AsksForClarification()
+    {
+        var service = CreateService();
+
+        var decision = await service.BuildDecisionAsync(new TurnContext
+        {
+            RawTranscript = "set an alarm",
+            NormalizedTranscript = "set an alarm"
+        });
+
+        Assert.Equal("alarm_clarify", decision.IntentName);
+        Assert.Null(decision.SkillName);
+        Assert.Equal("What time should I set the alarm for?", decision.ReplyText);
+    }
+
+    [Fact]
+    public async Task BuildDecisionAsync_SetTimerWithoutDuration_AsksForClarification()
+    {
+        var service = CreateService();
+
+        var decision = await service.BuildDecisionAsync(new TurnContext
+        {
+            RawTranscript = "set a timer",
+            NormalizedTranscript = "set a timer"
+        });
+
+        Assert.Equal("timer_clarify", decision.IntentName);
+        Assert.Null(decision.SkillName);
+        Assert.Equal("How long should I set the timer for?", decision.ReplyText);
+    }
+
     [Fact]
     public async Task BuildDecisionAsync_OpenPhotoGallery_MapsToGalleryLaunch()
     {

OpenJibo/tests/Jibo.Cloud.Tests/WebSockets/JiboWebSocketServiceTests.cs

@@ -383,6 +383,67 @@ public sealed class JiboWebSocketServiceTests
         Assert.Equal("timerValue", redirectPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("intent").GetString());
     }
 
+    [Fact]
+    public async Task ClientAsr_OpenTheClock_RedirectsIntoClockSkillWithAskForTimeIntent()
+    {
+        await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-clock-open-token",
+            Text = """{"type":"LISTEN","transID":"trans-clock-open","data":{"rules":["globals/global_commands_launch"]}}"""
+        });
+
+        var replies = await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-clock-open-token",
+            Text = """{"type":"CLIENT_ASR","transID":"trans-clock-open","data":{"text":"open the clock"}}"""
+        });
+
+        Assert.Equal(4, replies.Count);
+        Assert.Equal("SKILL_REDIRECT", ReadReplyType(replies[2]));
+
+        using var listenPayload = JsonDocument.Parse(replies[0].Text!);
+        Assert.Equal("askForTime", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("intent").GetString());
+        Assert.Equal("clock", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("entities").GetProperty("domain").GetString());
+
+        using var redirectPayload = JsonDocument.Parse(replies[2].Text!);
+        Assert.Equal("@be/clock", redirectPayload.RootElement.GetProperty("data").GetProperty("match").GetProperty("skillID").GetString());
+        Assert.Equal("askForTime", redirectPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("intent").GetString());
+    }
+
+    [Fact]
+    public async Task ClientAsr_WhatTimeIsIt_RedirectsIntoClockSkillWithAskForTimeIntent()
+    {
+        await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-clock-voice-time-token",
+            Text = """{"type":"LISTEN","transID":"trans-clock-voice-time","data":{"rules":["globals/global_commands_launch"]}}"""
+        });
+
+        var replies = await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-clock-voice-time-token",
+            Text = """{"type":"CLIENT_ASR","transID":"trans-clock-voice-time","data":{"text":"what time is it"}}"""
+        });
+
+        Assert.Equal(4, replies.Count);
+
+        using var listenPayload = JsonDocument.Parse(replies[0].Text!);
+        Assert.Equal("askForTime", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("intent").GetString());
+        Assert.Equal("@be/clock", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("skill").GetString());
+    }
+
     [Fact]
     public async Task ClientAsr_SetAlarmForSevenThirtyAm_RedirectsIntoClockSkillWithAlarmEntities()
     {
@@ -414,6 +475,71 @@ public sealed class JiboWebSocketServiceTests
         Assert.Equal("am", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("entities").GetProperty("ampm").GetString());
     }
 
+    [Fact]
+    public async Task ClientAsr_SetAlarmForEightThirty_ParsesCompactAlarmTime()
+    {
+        await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-clock-compact-alarm-token",
+            Text = """{"type":"LISTEN","transID":"trans-clock-compact-alarm","data":{"rules":["globals/global_commands_launch"]}}"""
+        });
+
+        var replies = await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-clock-compact-alarm-token",
+            Text = """{"type":"CLIENT_ASR","transID":"trans-clock-compact-alarm","data":{"text":"set an alarm for 830"}}"""
+        });
+
+        Assert.Equal(4, replies.Count);
+
+        using var listenPayload = JsonDocument.Parse(replies[0].Text!);
+        Assert.Equal("8:30", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("entities").GetProperty("time").GetString());
+        Assert.Equal("am", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("entities").GetProperty("ampm").GetString());
+    }
+
+    [Fact]
+    public async Task ClientAsr_SetAlarmWithoutTime_UsesClarificationSpeechInsteadOfClockRedirect()
+    {
+        await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-clock-clarify-alarm-token",
+            Text = """{"type":"LISTEN","transID":"trans-clock-clarify-alarm","data":{"rules":["globals/global_commands_launch"]}}"""
+        });
+
+        var replies = await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-clock-clarify-alarm-token",
+            Text = """{"type":"CLIENT_ASR","transID":"trans-clock-clarify-alarm","data":{"text":"set an alarm"}}"""
+        });
+
+        Assert.Equal(3, replies.Count);
+        Assert.Equal("SKILL_ACTION", ReadReplyType(replies[2]));
+
+        using var skillPayload = JsonDocument.Parse(replies[2].Text!);
+        var esml = skillPayload.RootElement
+            .GetProperty("data")
+            .GetProperty("action")
+            .GetProperty("config")
+            .GetProperty("jcp")
+            .GetProperty("config")
+            .GetProperty("play")
+            .GetProperty("esml")
+            .GetString();
+        Assert.Contains("What time should I set the alarm for?", esml, StringComparison.Ordinal);
+    }
+
     [Fact]
     public async Task ClientAsr_OpenPhotoGallery_RedirectsIntoGallerySkill()
     {
@@ -1703,9 +1829,9 @@ public sealed class JiboWebSocketServiceTests
             Text = """{"type":"LISTEN","transID":"trans-second","data":{"text":"what time is it","rules":["follow-up"]}}"""
         });
 
-        Assert.Equal(3, followUpReplies.Count);
+        Assert.Equal(4, followUpReplies.Count);
         using var payload = JsonDocument.Parse(followUpReplies[0].Text!);
-        Assert.Equal("time", payload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("intent").GetString());
+        Assert.Equal("askForTime", payload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("intent").GetString());
         Assert.Equal("trans-second", payload.RootElement.GetProperty("transID").GetString());
 
         var session = _store.FindSessionByToken("hub-followup-audio-token");