Skip to content

feat: harden cljs conversation command plan #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
meekmachine merged 1 commit into from
May 28, 2026
Merged

feat: harden cljs conversation command plan #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions scripts/smoke-cljs-blink.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,7 @@ if (!conversationEvents.some((event) => event.type === 'AGENT_SPEAKING') ||

if (!conversationCommands.some((entry) => entry.target === 'tts' && entry.command.type === 'startSpeech') ||
!conversationCommands.some((entry) => entry.target === 'tts' && entry.command.type === 'stop') ||
!conversationCommands.some((entry) => entry.target === 'lipsync' && entry.command.type === 'stop') ||
!conversationCommands.some((entry) => entry.target === 'transcription' && entry.command.type === 'start') ||
!conversationCommands.some((entry) => entry.target === 'gaze' && entry.command.type === 'resetToNeutral')) {
throw new Error(`Expected CLJS conversation orchestration commands, received ${JSON.stringify(conversationCommands)}`);
Expand All @@ -999,6 +1000,38 @@ if (conversationStates.length < 7) {

conversation.dispose();

const featureGatedConversationCommands = [];
const featureGatedConversation = createConversationAgency(
{ autoListen: false, useGaze: false, useProsody: false, useBlink: false },
{
onAgencyCommand(target, command) {
featureGatedConversationCommands.push({ target, command });
},
},
);

featureGatedConversation.start();
featureGatedConversation.agentStart('quiet mode');
featureGatedConversation.interrupt('manual');
featureGatedConversation.stop();

if (featureGatedConversationCommands.some((entry) => (
entry.target === 'gaze' ||
entry.target === 'prosodic' ||
entry.target === 'blink' ||
(entry.target === 'transcription' && entry.command.type === 'start')
))) {
throw new Error(`Expected disabled conversation features to skip their commands, received ${JSON.stringify(featureGatedConversationCommands)}`);
}

if (!featureGatedConversationCommands.some((entry) => entry.target === 'tts' && entry.command.type === 'stop') ||
!featureGatedConversationCommands.some((entry) => entry.target === 'vocal' && entry.command.type === 'stop') ||
!featureGatedConversationCommands.some((entry) => entry.target === 'lipsync' && entry.command.type === 'stop')) {
throw new Error(`Expected disabled-feature conversation to still stop speech surfaces, received ${JSON.stringify(featureGatedConversationCommands)}`);
}

featureGatedConversation.dispose();

const hairObjectStates = [];
const hairPhysicsUpdates = [];
const hairStates = [];
Expand Down
67 changes: 48 additions & 19 deletions src-cljs/latticework/conversation.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,25 @@
:target target
:command command})

(defn- config-enabled? [state key]
(boolean (get-in @state [:config key])))

(defn- command-when [enabled target command]
(when enabled
(command-output target command)))

(defn- mouth-stop-outputs [reason]
[(command-output "vocal" {:type "stop" :reason reason})
(command-output "lipsync" {:type "stop" :reason reason})])

(defn- speaking-stop-outputs [state reason]
(vec (concat
[(command-output "tts" {:type "stop" :reason reason})]
(mouth-stop-outputs reason)
[(command-when (config-enabled? state :useProsody)
"prosodic"
{:type "stop" :reason reason})])))

(defn- result [value outputs]
{:result value :outputs (vec (remove nil? outputs))})

Expand All @@ -75,8 +94,8 @@
:interrupted false
:interruptionSource nil))
(result true [(event-output {:type "START"})
(command-output "transcription" {:type "start"})
(command-output "blink" {:type "enable"})
(command-when (:autoListen (:config @state)) "transcription" {:type "start"})
(command-when (config-enabled? state :useBlink) "blink" {:type "enable"})
(state-output state)]))

(defn stop! [state]
Expand All @@ -86,11 +105,14 @@
:interrupted false
:interruptionSource nil))
(result true [(event-output {:type "STOP"})
(command-output "tts" {:type "stop"})
(command-output "vocal" {:type "stop"})
(command-output "prosodic" {:type "stop"})
(command-output "tts" {:type "stop" :reason "conversationStop"})
(command-output "vocal" {:type "stop" :reason "conversationStop"})
(command-output "lipsync" {:type "stop" :reason "conversationStop"})
(command-when (config-enabled? state :useProsody)
"prosodic"
{:type "stop" :reason "conversationStop"})
(command-output "transcription" {:type "stop"})
(command-output "blink" {:type "disable"})
(command-when (config-enabled? state :useBlink) "blink" {:type "disable"})
(state-output state)]))

(defn agent-start! [state text]
Expand All @@ -109,15 +131,22 @@
:text text})
(command-output "tts" {:type "startSpeech" :text text})
(command-output "tts" {:type "planText" :text text})
(command-output "prosodic" {:type "startTalking"})
(command-output "gaze" {:type "setTarget" :target {:x 0 :y 0 :z 0}})
(command-when (config-enabled? state :useProsody)
"prosodic"
{:type "startTalking"})
(command-when (config-enabled? state :useGaze)
"gaze"
{:type "setTarget" :target {:x 0 :y 0 :z 0}})
(state-output state)])))

(defn agent-end! [state]
(set-conversation-state! state "idle")
(result true [(event-output {:type "AGENT_FINISHED" :turnId (:turnId @state)})
(command-output "prosodic" {:type "stopTalking"})
(command-output "vocal" {:type "stop"})
(command-when (config-enabled? state :useProsody)
"prosodic"
{:type "stopTalking"})
(command-output "vocal" {:type "stop" :reason "agentEnd"})
(command-output "lipsync" {:type "stop" :reason "agentEnd"})
(when (:autoListen (:config @state))
(command-output "transcription" {:type "start"}))
(state-output state)]))
Expand All @@ -134,7 +163,7 @@
:interrupted (boolean interrupted?)})
(when final?
(command-output "transcription" {:type "stop"}))
(when final?
(when (and final? (config-enabled? state :useGaze))
(command-output "gaze" {:type "setTarget" :target {:x -0.2 :y -0.15 :z 0}}))
(state-output state)])))

Expand All @@ -156,14 +185,14 @@
#(assoc % :state "interrupted"
:interrupted true
:interruptionSource source))
(result true [(event-output {:type "INTERRUPTED"
:turnId (:turnId @state)
:source source})
(command-output "tts" {:type "stop"})
(command-output "vocal" {:type "stop"})
(command-output "prosodic" {:type "stop"})
(command-output "gaze" {:type "resetToNeutral" :duration 120})
(state-output state)])))))
(result true (concat [(event-output {:type "INTERRUPTED"
:turnId (:turnId @state)
:source source})]
(speaking-stop-outputs state "interruption")
[(command-when (config-enabled? state :useGaze)
"gaze"
{:type "resetToNeutral" :duration 120})
(state-output state)]))))))

(defn update-config! [state config]
(update-state! state #(update % :config merge (normalize-config config)))
Expand Down
Loading