Skip to content

Commit 9979d51

Browse files
lukemelialukemelia
committed
Merge branch 'main' into cs-7993-support-multiple-tool-calls-per-ai-response
2 parents bbbf2c4 + 0bfa94e commit 9979d51

33 files changed

+3486
-1033
lines changed

‎packages/base/code-ref.gts

+14-6
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import {
2121
type ResolvedCodeRef,
2222
isUrlLike,
2323
CardURLContextName,
24+
isResolvedCodeRef,
2425
} from '@cardstack/runtime-common';
2526
import { not } from '@cardstack/boxel-ui/helpers';
2627
import { BoxelInput } from '@cardstack/boxel-ui/components';
@@ -84,6 +85,9 @@ class EditView extends Component<typeof CodeRefField> {
8485

8586
let name = parts.pop()!;
8687
let module = parts.join('/');
88+
if (isUrlLike(module) && this.cardURL) {
89+
module = new URL(module, new URL(this.cardURL)).href;
90+
}
8791
try {
8892
let code = (await import(module))[name];
8993
if (code) {
@@ -106,14 +110,16 @@ export default class CodeRefField extends FieldDef {
106110
static [primitive]: ResolvedCodeRef;
107111

108112
static [serialize](
109-
codeRef: ResolvedCodeRef,
113+
codeRef: ResolvedCodeRef | {},
110114
_doc: JSONAPISingleResourceDocument,
111115
_visited?: Set<string>,
112116
opts?: SerializeOpts,
113117
) {
114118
return {
115119
...codeRef,
116120
...(opts?.maybeRelativeURL &&
121+
codeRef &&
122+
isResolvedCodeRef(codeRef) &&
117123
!opts?.useAbsoluteURL &&
118124
isUrlLike(codeRef.module)
119125
? { module: opts.maybeRelativeURL(codeRef.module) }
@@ -122,17 +128,19 @@ export default class CodeRefField extends FieldDef {
122128
}
123129
static async [deserialize]<T extends BaseDefConstructor>(
124130
this: T,
125-
codeRef: ResolvedCodeRef,
131+
codeRef: ResolvedCodeRef | {},
126132
): Promise<BaseInstanceType<T>> {
127133
return { ...codeRef } as BaseInstanceType<T>; // return a new object so that the model cannot be mutated from the outside
128134
}
135+
129136
static [queryableValue](
130-
codeRef: ResolvedCodeRef | undefined,
137+
codeRef: ResolvedCodeRef | {} | undefined,
131138
stack: CardDef[] = [],
132139
) {
133140
return maybeSerializeCodeRef(codeRef, stack);
134141
}
135-
static [formatQuery](codeRef: ResolvedCodeRef) {
142+
143+
static [formatQuery](codeRef: ResolvedCodeRef | {}) {
136144
return maybeSerializeCodeRef(codeRef);
137145
}
138146

@@ -142,10 +150,10 @@ export default class CodeRefField extends FieldDef {
142150
}
143151

144152
function maybeSerializeCodeRef(
145-
codeRef: ResolvedCodeRef | undefined,
153+
codeRef: ResolvedCodeRef | {} | undefined,
146154
stack: CardDef[] = [],
147155
) {
148-
if (codeRef) {
156+
if (codeRef && isResolvedCodeRef(codeRef)) {
149157
if (isUrlLike(codeRef.module)) {
150158
// if a stack is passed in, use the containing card to resolve relative references
151159
let moduleHref =

‎packages/base/spec.gts

+5-10
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ class SpecTypeField extends StringField {
4949
export class Spec extends CardDef {
5050
static displayName = 'Spec';
5151
static icon = BoxModel;
52-
@field name = contains(StringField);
5352
@field readMe = contains(MarkdownField);
5453

5554
@field ref = contains(CodeRef);
@@ -77,14 +76,7 @@ export class Spec extends CardDef {
7776
});
7877
@field linkedExamples = linksToMany(CardDef);
7978
@field containedExamples = containsMany(FieldDef, { isUsed: true });
80-
@field title = contains(StringField, {
81-
computeVia: function (this: Spec) {
82-
if (this.name) {
83-
return this.name;
84-
}
85-
return this.ref.name === 'default' ? undefined : this.ref.name;
86-
},
87-
});
79+
@field title = contains(StringField);
8880

8981
static isolated = class Isolated extends Component<typeof this> {
9082
icon: CardOrFieldTypeIcon | undefined;
@@ -136,7 +128,9 @@ export class Spec extends CardDef {
136128
{{/if}}
137129
</div>
138130
<div class='header-info-container'>
139-
<h1 class='title' id='title' data-test-title><@fields.title /></h1>
131+
<h1 class='title' id='title' data-test-title>
132+
<@fields.title />
133+
</h1>
140134
<p class='description' data-test-description>
141135
<@fields.description />
142136
</p>
@@ -229,6 +223,7 @@ export class Spec extends CardDef {
229223
-webkit-line-clamp: 2;
230224
overflow: hidden;
231225
text-wrap: pretty;
226+
word-break: break-word;
232227
}
233228
.box {
234229
border: 1px solid var(--boxel-border-color);

‎packages/boxel-ui/addon/bin/conditional-build.sh

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#! /bin/sh
2+
set -x
23

34
CURRENT_DIR="$(pwd)"
45
SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd)"
@@ -12,9 +13,13 @@ if [ ! -d "$DIST_DIR" ]; then
1213
pnpm run build
1314
exit 0
1415
fi
15-
16-
mod_time_src=$(find "$SRC_DIR" -type f -exec stat -f %m {} + | sort -nr | head -n1)
17-
mod_time_dist=$(find "$DIST_DIR" -type f -exec stat -f %m {} + | sort -nr | head -n1)
16+
if [ "$(uname)" = "Darwin" ]; then
17+
mod_time_src=$(find "$SRC_DIR" -type f -exec stat -f %m {} + | sort -nr | head -n1)
18+
mod_time_dist=$(find "$DIST_DIR" -type f -exec stat -f %m {} + | sort -nr | head -n1)
19+
else
20+
mod_time_src=$(find "$SRC_DIR" -type f -printf "%T@\n" | sort -nr | head -n1 | cut -d. -f1)
21+
mod_time_dist=$(find "$DIST_DIR" -type f -printf "%T@\n" | sort -nr | head -n1 | cut -d. -f1)
22+
fi
1823

1924
if [ "$mod_time_src" -gt "$mod_time_dist" ]; then
2025
echo "boxel-ui/addon dist dir is out of date. Building in ${SRC_DIR}/.."

‎packages/host/app/components/matrix/room.gts

+5-13
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import { v4 as uuidv4 } from 'uuid';
3030
import { BoxelButton } from '@cardstack/boxel-ui/components';
3131
import { not } from '@cardstack/boxel-ui/helpers';
3232

33-
import { unixTime } from '@cardstack/runtime-common';
3433
import { DEFAULT_LLM_LIST } from '@cardstack/runtime-common/matrix-constants';
3534

3635
import AddSkillsToRoomCommand from '@cardstack/host/commands/add-skills-to-room';
@@ -93,7 +92,7 @@ export default class Room extends Component<Signature> {
9392
@registerScroller={{this.registerMessageScroller}}
9493
@isPending={{this.isPendingMessage message}}
9594
@monacoSDK={{@monacoSDK}}
96-
@isStreaming={{this.isMessageStreaming message i}}
95+
@isStreaming={{this.isMessageStreaming message}}
9796
@retryAction={{this.maybeRetryAction i message}}
9897
data-test-message-idx={{i}}
9998
/>
@@ -361,7 +360,8 @@ export default class Room extends Component<Signature> {
361360
// If we are permitted to auto-scroll and if there are no unread messages in the
362361
// room, then scroll to the last message in the room.
363362
!this.hasUnreadMessages &&
364-
index === this.messages.length - 1
363+
index === this.messages.length - 1 &&
364+
!this.isScrolledToBottom
365365
) {
366366
scrollTo();
367367
} else if (
@@ -492,16 +492,8 @@ export default class Room extends Component<Signature> {
492492
return undefined;
493493
};
494494

495-
private isMessageStreaming = (message: Message, messageIndex: number) => {
496-
return (
497-
!message.isStreamingFinished &&
498-
this.isLastMessage(messageIndex) &&
499-
// Older events do not come with isStreamingFinished property so we have
500-
// no other way to determine if the message is done streaming other than
501-
// checking if they are old messages (older than 60 seconds as an arbitrary
502-
// threshold)
503-
unixTime(new Date().getTime() - message.created.getTime()) < 60
504-
);
495+
private isMessageStreaming = (message: Message) => {
496+
return !message.isStreamingFinished;
505497
};
506498

507499
private doMatrixEventFlush = restartableTask(async () => {

‎packages/host/app/components/operator-mode/code-submode/spec-preview.gts

+57-35
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import {
2121
RealmIcon,
2222
LoadingIndicator,
2323
} from '@cardstack/boxel-ui/components';
24-
import { not } from '@cardstack/boxel-ui/helpers';
2524
import { cn } from '@cardstack/boxel-ui/helpers';
2625

2726
import {
@@ -192,50 +191,71 @@ class SpecPreviewContent extends GlimmerComponent<ContentSignature> {
192191
};
193192
};
194193

194+
get displayIsolated() {
195+
return !this.args.canWrite && this.args.ids.length > 0;
196+
}
197+
198+
get displayCannotWrite() {
199+
return !this.args.canWrite && this.args.ids.length === 0;
200+
}
201+
195202
<template>
196-
<div class={{cn 'container' spec-intent-message=@showCreateSpecIntent}}>
203+
<div
204+
class={{cn
205+
'container'
206+
spec-intent-message=@showCreateSpecIntent
207+
cannot-write=this.displayCannotWrite
208+
}}
209+
>
197210
{{#if @showCreateSpecIntent}}
198211
<div data-test-create-spec-intent-message>
199212
Create a Boxel Specification to be able to create new instances
200213
</div>
201-
{{else if (not @canWrite)}}
214+
{{else if this.displayCannotWrite}}
202215
<div data-test-cannot-write-intent-message>
203-
Cannot create Boxel Specification inside this realm
216+
Cannot create new Boxel Specification inside this realm
204217
</div>
218+
205219
{{else}}
206-
<div class='spec-preview'>
207-
<div class='spec-selector' data-test-spec-selector>
208-
<BoxelSelect
209-
@options={{@ids}}
210-
@selected={{@selectedId}}
211-
@onChange={{@selectId}}
212-
@matchTriggerWidth={{true}}
213-
@disabled={{this.onlyOneInstance}}
214-
as |id|
215-
>
216-
{{#if id}}
217-
{{#let (this.getDropdownData id) as |data|}}
218-
{{#if data}}
219-
<div class='spec-selector-item'>
220-
<RealmIcon
221-
@canAnimate={{true}}
222-
class='url-realm-icon'
223-
@realmInfo={{data.realmInfo}}
224-
/>
225-
{{data.localPath}}
226-
</div>
227-
{{/if}}
228-
{{/let}}
229-
{{/if}}
230-
</BoxelSelect>
231-
</div>
232220

233-
{{#if @spec}}
221+
{{#if @spec}}
222+
<div class='spec-preview'>
223+
<div class='spec-selector' data-test-spec-selector>
224+
<BoxelSelect
225+
@options={{@ids}}
226+
@selected={{@selectedId}}
227+
@onChange={{@selectId}}
228+
@matchTriggerWidth={{true}}
229+
@disabled={{this.onlyOneInstance}}
230+
as |id|
231+
>
232+
{{#if id}}
233+
{{#let (this.getDropdownData id) as |data|}}
234+
{{#if data}}
235+
<div class='spec-selector-item'>
236+
<RealmIcon
237+
@canAnimate={{true}}
238+
class='url-realm-icon'
239+
@realmInfo={{data.realmInfo}}
240+
/>
241+
{{data.localPath}}
242+
</div>
243+
{{/if}}
244+
{{/let}}
245+
{{/if}}
246+
</BoxelSelect>
247+
</div>
248+
234249
{{#let (getComponent @spec) as |CardComponent|}}
235-
<CardComponent @format='edit' />
250+
{{#if this.displayIsolated}}
251+
252+
<CardComponent @format='isolated' />
253+
{{else}}
254+
<CardComponent @format='edit' />
255+
{{/if}}
236256
{{/let}}
237-
{{/if}}
238-
</div>
257+
</div>
258+
{{/if}}
239259
{{/if}}
240260
</div>
241261

@@ -255,7 +275,8 @@ class SpecPreviewContent extends GlimmerComponent<ContentSignature> {
255275
width: 100%;
256276
padding: var(--boxel-sp-sm);
257277
}
258-
.spec-intent-message {
278+
.spec-intent-message,
279+
.cannot-write {
259280
background-color: var(--boxel-200);
260281
color: var(--boxel-450);
261282
font-weight: 500;
@@ -357,6 +378,7 @@ export default class SpecPreview extends GlimmerComponent<Signature> {
357378
attributes: {
358379
specType,
359380
ref,
381+
title: ref.name,
360382
},
361383
meta: {
362384
adoptsFrom: specRef,

‎packages/host/app/lib/matrix-classes/message-command.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export default class MessageCommand {
5555
}
5656

5757
get status() {
58-
if (this.commandService.currentlyExecutingCommandRequestIds.has(this.id)) {
58+
if (this.commandService.currentlyExecutingCommandRequestIds.has(this.id!)) {
5959
return 'applying';
6060
}
6161

‎packages/host/app/services/matrix-service.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import {
2929
ResolvedCodeRef,
3030
splitStringIntoChunks,
3131
type LooseSingleCardDocument,
32-
isUrlLike,
3332
} from '@cardstack/runtime-common';
3433

3534
import {
@@ -39,6 +38,7 @@ import {
3938
getPatchTool,
4039
} from '@cardstack/runtime-common/helpers/ai';
4140

41+
import { escapeHtmlOutsideCodeBlocks } from '@cardstack/runtime-common/helpers/html';
4242
import { getMatrixUsername } from '@cardstack/runtime-common/matrix-client';
4343

4444
import {
@@ -731,7 +731,8 @@ export default class MatrixService extends Service {
731731
clientGeneratedId = uuidv4(),
732732
context?: OperatorModeContext,
733733
): Promise<void> {
734-
let html = markdownToHtml(body);
734+
let html = markdownToHtml(escapeHtmlOutsideCodeBlocks(body));
735+
735736
let tools: Tool[] = [getSearchTool()];
736737
let attachedOpenCards: CardDef[] = [];
737738
let submode = context?.submode;

‎packages/host/tests/acceptance/basic-test.gts

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ module('Acceptance | basic tests', function (hooks) {
8181
'index.gts': { Index },
8282
'person.gts': { Person },
8383
'person-entry.json': new Spec({
84-
name: 'Person',
84+
title: 'Person',
8585
description: 'Spec',
8686
isField: false,
8787
ref: {

0 commit comments

Comments
 (0)