stuff

apps/copilot/src/cmds/index.ts

@@ -1,2 +1,3 @@
 export * from './history';
 export * from './clear';
+export * from './logout';

apps/copilot/src/cmds/logout.ts

@@ -0,0 +1,10 @@
+import { MessageSendActivity } from '@teams.sdk/api';
+import { Context } from '@teams.sdk/apps';
+
+import { State } from '../state';
+
+export async function logout({ activity, storage }: Context<MessageSendActivity>) {
+  const state = await State.fromActivity(activity, storage);
+  state.user = {};
+  await state.save(activity, storage);
+}

apps/copilot/src/events/mention.ts

@@ -18,7 +18,7 @@ export async function mention({
   // if not authenticated, set the conversation
   // where the auth flow began and prompt user to
   // to sign in.
-  if (!state.user.auth?.token) {
+  if (!state.authenticated) {
     state.user.auth = {
       conversationId: activity.conversation.id,
     };
@@ -29,10 +29,11 @@ export async function mention({
   }
 
   await say({ type: 'typing' });
+
   const prompt = new RootPrompt(say, state);
   const { text, attachments } = await prompt.chat(activity.text);
-  await state.save(activity, storage);
 
+  await state.save(activity, storage);
   await say(
     withAIContentLabel({
       type: 'message',

apps/copilot/src/events/message.ts

@@ -13,15 +13,15 @@ export async function message({
   withAIContentLabel,
   next,
 }: Context<MessageSendActivity>) {
-  if (activity.conversation.isGroup) return next();
+  if (activity.conversation.isGroup) return;
 
   const start = new Date();
   const state = await State.fromActivity(activity, storage);
 
   // if not authenticated, set the conversation
   // where the auth flow began and prompt user to
   // to sign in.
-  if (!state.user.auth?.token) {
+  if (state.authenticated) {
     state.user.auth = {
       conversationId: activity.conversation.id,
     };
@@ -32,10 +32,11 @@ export async function message({
   }
 
   await say({ type: 'typing' });
+
   const prompt = new RootPrompt(say, state);
   const { text, attachments } = await prompt.chat(activity.text);
-  await state.save(activity, storage);
 
+  await state.save(activity, storage);
   await say(
     withAIContentLabel({
       type: 'message',

apps/copilot/src/index.ts

@@ -22,12 +22,13 @@ const app = new App({
 
 app.message('/clear', cmds.clear);
 app.message('/history', cmds.history);
+app.message('/logout', cmds.logout);
 app.event('signin', events.signin);
 
 app.on('install.add', events.install);
 app.on('install.remove', events.uninstall);
-app.on('message', events.message);
 app.on('mention', events.mention);
+app.on('message', events.message);
 app.on('dialog.open', events.dialogOpen);
 app.on('message.submit.feedback', () => {
   return {

apps/copilot/src/prompts/root.ts

@@ -49,10 +49,6 @@ export class RootPrompt {
       messages: new LocalMemory({
         max: 10,
         messages: state.chat.messages,
-        collapse: {
-          model,
-          strategy: 'half',
-        },
       }),
       instructions: [
         'You are an ai assistant that runs in Microsoft Teams.',

apps/copilot/src/state.ts

@@ -1,12 +1,21 @@
 import { Message } from '@teams.sdk/ai';
 import { Activity } from '@teams.sdk/api';
 import { Storage } from '@teams.sdk/common/storage';
+
 import * as MSGraph from '@microsoft/microsoft-graph-types';
+import { isAfter } from 'date-fns';
 
 export class State {
   user: UserState;
   chat: ChatState;
 
+  get authenticated() {
+    return (
+      !!this.user.auth?.token &&
+      (!this.user.auth.expiration || isAfter(new Date(), this.user.auth.expiration))
+    );
+  }
+
   constructor(user: UserState, chat: ChatState) {
     this.user = user;
     this.chat = chat;