fix: typecast fix for new ai library version

This will add the keys to the ssh agent if requested by the ssh config
file. It also adds the IdentityAgent keyword to override the environment
variable.

.github/workflows/build-helper.yml

@@ -71,7 +71,7 @@ jobs:
                   APPLE_APP_SPECIFIC_PASSWORD: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_NOTARIZATION_PWD }}
                   APPLE_TEAM_ID: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
             - name: Upload to S3 staging
-              run: aws s3 cp make/ s3://waveterm-github-artifacts/staging-legacy/${{ steps.set-version.outputs.WAVETERM_VERSION }}/ --recursive --exclude "*/*" --exclude "builder-*.yml"
+              run: aws s3 cp make/ s3://waveterm-github-artifacts/staging/${{ steps.set-version.outputs.WAVETERM_VERSION }}/ --recursive --exclude "*/*" --exclude "builder-*.yml"
               env:
                   AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}"
                   AWS_SECRET_ACCESS_KEY: "${{ secrets.S3_SECRETKEY }}"

README.md

@@ -7,10 +7,6 @@
   <br/>
 </p>
 
-# Wave Legacy
-
-This branch is for the legacy v0.7.7 version of Wave.  For the new Wave v8+ code, please use the main branch.
-
 # Wave Terminal
 
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fwavetermdev%2Fwaveterm.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fwavetermdev%2Fwaveterm?ref=badge_shield)

buildres/README.md

@@ -13,7 +13,7 @@ is [`electron-builder.config.js`](../electron-builder.config.js).
 
 This will also sign and notarize the macOS app package.
 
-Once a build is complete, it will be placed in `s3://waveterm-github-artifacts/staging-legacy/<version>`.
+Once a build is complete, it will be placed in `s3://waveterm-github-artifacts/staging/<version>`.
 It can be downloaded for testing using the [`download-staged-artifact.sh`](./download-staged-artifact.sh)
 script. When you are ready to publish the artifacts to the public release feed, use the
 [`publish-from-staging.sh`](./publish-from-staging.sh) script to directly copy the artifacts from

buildres/deprecated/upload-release.sh

@@ -7,7 +7,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 BUILDS_DIR=$SCRIPT_DIR/builds
 TEMP2_DIR=$SCRIPT_DIR/temp2
 
-AUTOUPDATE_RELEASE_PATH="dl.waveterm.dev/releases-legacy"
+AUTOUPDATE_RELEASE_PATH="dl.waveterm.dev/releases"
 
 # Copy the builds to the temp2 directory
 echo "Copying builds to temp2"

buildres/download-staged-artifact.sh

@@ -13,4 +13,4 @@ fi
 DOWNLOAD_DIR=$VERSION-staged
 rm -rf $DOWNLOAD_DIR
 mkdir -p $DOWNLOAD_DIR
-aws s3 cp s3://waveterm-github-artifacts/staging-legacy/$VERSION/ $DOWNLOAD_DIR/ --recursive --profile $AWS_PROFILE
+aws s3 cp s3://waveterm-github-artifacts/staging/$VERSION/ $DOWNLOAD_DIR/ --recursive --profile $AWS_PROFILE

buildres/publish-from-staging.sh

@@ -9,8 +9,8 @@ if [ -z "$VERSION" ]; then
     exit
 fi
 
-ORIGIN="waveterm-github-artifacts/staging-legacy/$VERSION/"
-DESTINATION="dl.waveterm.dev/releases-legacy/"
+ORIGIN="waveterm-github-artifacts/staging/$VERSION/"
+DESTINATION="dl.waveterm.dev/releases/"
 
 OUTPUT=$(aws s3 cp s3://$ORIGIN s3://$DESTINATION --recursive --profile $AWS_PROFILE)
 

electron-builder.config.js

@@ -88,7 +88,7 @@ const config = {
     },
     publish: {
         provider: "generic",
-        url: "https://dl.waveterm.dev/releases-legacy",
+        url: "https://dl.waveterm.dev/releases",
     },
 };
 

package.json

@@ -1,21 +1,21 @@
 {
-    "name": "wavelegacy",
+    "name": "waveterm",
     "author": {
         "name": "Command Line Inc",
         "email": "info@commandline.dev"
     },
-    "productName": "WaveLegacy",
+    "productName": "Wave",
     "description": "An Open-Source, AI-Native, Terminal Built for Seamless Workflows",
-    "version": "0.7.7",
+    "version": "0.7.6",
     "main": "dist/emain.js",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
         "url": "https://github.com/wavetermdev/waveterm"
     },
-    "homepage": "https://www.waveterm.dev",
+    "homepage": "https://waveterm.dev",
     "build": {
-        "appId": "dev.commandline.wavelegacy"
+        "appId": "dev.commandline.waveterm"
     },
     "dependencies": {
         "@lexical/react": "^0.17.0",

src/app/common/modals/about.tsx

@@ -68,7 +68,7 @@ class AboutModal extends React.Component<{}, {}> {
                             <img src={logo} alt="logo" />
                         </div>
                         <div className="text-wrapper">
-                            <div>Wave Terminal (Legacy)</div>
+                            <div>Wave Terminal</div>
                             <div className="text-standard">
                                 Open-Source AI-Native Terminal
                                 <br />

src/app/common/modals/editremoteconn.tsx

@@ -269,7 +269,7 @@ class EditRemoteConnModal extends React.Component<{}, {}> {
                             Most options for connections imported from an ssh config file cannot be edited. For these
                             changes, you must edit the config file and import it again. The shell preference can be
                             edited, but will return to the default if you import again. It will stay changed if you
-                            follow <a href="https://legacydocs.waveterm.dev/features/sshconfig-imports">this procedure</a>.
+                            follow <a href="https://docs.waveterm.dev/features/sshconfig-imports">this procedure</a>.
                         </span>
                     }
                     icon={<i className="fa-sharp fa-regular fa-fw fa-triangle-exclamation" />}

src/app/common/modals/tos.tsx

@@ -98,7 +98,7 @@ class TosModal extends React.Component<{}, {}> {
                                         We collect minimal anonymous
                                         <a
                                             target="_blank"
-                                            href={util.makeExternLink("https://legacydocs.waveterm.dev/reference/telemetry")}
+                                            href={util.makeExternLink("https://docs.waveterm.dev/reference/telemetry")}
                                             rel={"noopener"}
                                         >
                                             &nbsp;telemetry data&nbsp;

src/app/common/modals/viewremoteconndetail.tsx

@@ -216,7 +216,7 @@ class ViewRemoteConnDetailModal extends React.Component<{}, {}> {
                             <span>
                                 Connections imported from an ssh config file can be deleted, but will come back upon
                                 importing again. They will stay removed if you follow{" "}
-                                <a href="https://legacydocs.waveterm.dev/features/sshconfig-imports">this procedure</a>.
+                                <a href="https://docs.waveterm.dev/features/sshconfig-imports">this procedure</a>.
                             </span>
                         }
                         icon={<i className="fa-sharp fa-regular fa-fw fa-triangle-exclamation" />}

src/app/sidebar/main.tsx

@@ -333,7 +333,7 @@ class MainSideBar extends React.Component<MainSideBarProps, {}> {
                                     key="documentation"
                                     frontIcon={<i className="fa-sharp fa-regular fa-circle-question icon" />}
                                     contents="Documentation"
-                                    onClick={() => openLink("https://legacydocs.waveterm.dev")}
+                                    onClick={() => openLink("https://docs.waveterm.dev")}
                                     endIcons={[
                                         <CenteredIcon key="offsite" className="link-offsite hoverEffect">
                                             <i className="fa-sharp fa-solid fa-arrow-up-right-from-square"></i>

src/app/workspace/cmdinput/cmdinput.tsx

@@ -225,7 +225,7 @@ class CmdInput extends React.Component<{}, {}> {
                 <If condition={feState["invalidshellstate"]}>
                     <div className="remote-status-warning">
                         The shell state for this tab is invalid (
-                        <a target="_blank" href="https://legacydocs.waveterm.dev/reference/faq">
+                        <a target="_blank" href="https://docs.waveterm.dev/reference/faq">
                             see FAQ
                         </a>
                         ). Must reset to continue.

src/electron/emain.ts

@@ -375,7 +375,7 @@ function createWindow(clientData: ClientDataType | null): Electron.BrowserWindow
         win.webContents.send("zoom-changed");
     });
     win.webContents.setWindowOpenHandler(({ url, frameName }) => {
-        if (url.startsWith("https://docs.waveterm.dev/") || url.startsWith("https://legacydocs.waveterm.dev")) {
+        if (url.startsWith("https://docs.waveterm.dev/")) {
             console.log("openExternal docs", url);
             electron.shell.openExternal(url);
         } else if (url.startsWith("https://discord.gg/")) {

wavesrv/pkg/pcloud/pcloud.go

@@ -167,14 +167,7 @@ func SendTelemetry(ctx context.Context, force bool) error {
 	log.Printf("[pcloud] sending telemetry data\n")
 	dayStr := telemetry.GetCurDayStr()
 	defaultShellType := shellapi.DetectLocalShellType()
-	input := TelemetryInputType{
-		UserId:       clientData.UserId,
-		ClientId:     clientData.ClientId,
-		AppType:      "legacy",
-		CurDay:       dayStr,
-		DefaultShell: defaultShellType,
-		Activity:     activity,
-	}
+	input := TelemetryInputType{UserId: clientData.UserId, ClientId: clientData.ClientId, CurDay: dayStr, DefaultShell: defaultShellType, Activity: activity}
 	req, err := makeAnonPostReq(ctx, TelemetryUrl, input)
 	if err != nil {
 		return err

wavesrv/pkg/pcloud/pclouddata.go

@@ -24,7 +24,6 @@ type TelemetryInputType struct {
 	ClientId     string                    `json:"clientid"`
 	CurDay       string                    `json:"curday"`
 	DefaultShell string                    `json:"defaultshell"`
-	AppType      string                    `json:"apptype"`
 	Activity     []*telemetry.ActivityType `json:"activity"`
 }
 

yarn.lock

@@ -12620,9 +12620,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wavelegacy@workspace:.":
+"waveterm@workspace:.":
   version: 0.0.0-use.local
-  resolution: "wavelegacy@workspace:."
+  resolution: "waveterm@workspace:."
   dependencies:
     "@babel/cli": "npm:^7.24.8"
     "@babel/core": "npm:^7.25.2"